GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 17:47:32 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge pull request #144 from DSheirer/112-playlist-v2-loading-issue

Browse Source 
Resolves #112 issue with loading/discovering playlist V2 filename
This commit is contained in:
Denny Sheirer
2017-01-28 10:44:11 -05:00
committed by GitHub
parent c16416ab14 3283b66bdc
commit d500346ba2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/playlist/PlaylistManager.java
View File

@@ -212,13 +212,13 @@ public class PlaylistManager implements ChannelEventListener
{ {
if(mPlaylistCurrentPath == null) if(mPlaylistCurrentPath == null)
{ {
SystemProperties props = SystemProperties.getInstance(); //Temporarily removed and hard-coding the V2 playlist name. Will be reimplemented with future
//enhancement that allows multiple playlists.
// SystemProperties props = SystemProperties.getInstance();
// String playlistDefault = props.get("playlist.defaultfilename", "playlist_v2.xml");
// String playlistCurrent = props.get("playlist.currentfilename", playlistDefault);
String playlistDefault = props.get("playlist.defaultfilename", "playlist_v2.xml"); mPlaylistCurrentPath = getPlaylistFolderPath().resolve("playlist_v2.xml");
String playlistCurrent = props.get("playlist.currentfilename", playlistDefault);
mPlaylistCurrentPath = getPlaylistFolderPath().resolve(playlistCurrent);
} }
return mPlaylistCurrentPath; return mPlaylistCurrentPath;
@@ -347,7 +347,7 @@ public class PlaylistManager implements ChannelEventListener
*/ */
public PlaylistV2 load() public PlaylistV2 load()
{ {
mLog.info("loading version 2 playlist file [" + getPlaylistPath().toString() + "]"); mLog.info("Attempting to load version 2 playlist file [" + getPlaylistPath().toString() + "]");
PlaylistV2 playlist = null; PlaylistV2 playlist = null;