From 3283b66bdc51c23113fddeb0c465771e0b4aa1a9 Mon Sep 17 00:00:00 2001 From: Denny Date: Sat, 28 Jan 2017 10:43:18 -0500 Subject: [PATCH] Resolves #112 issue with loading/discovering playlist V2 filename from the system properties. V2 playlist name is now hard-coded until a future enhancement that supports multiple user playlists. --- src/playlist/PlaylistManager.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/playlist/PlaylistManager.java b/src/playlist/PlaylistManager.java index 0b3f50b0..d0e19c83 100644 --- a/src/playlist/PlaylistManager.java +++ b/src/playlist/PlaylistManager.java @@ -212,13 +212,13 @@ public class PlaylistManager implements ChannelEventListener { 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"); - - String playlistCurrent = props.get("playlist.currentfilename", playlistDefault); - - mPlaylistCurrentPath = getPlaylistFolderPath().resolve(playlistCurrent); + mPlaylistCurrentPath = getPlaylistFolderPath().resolve("playlist_v2.xml"); } return mPlaylistCurrentPath; @@ -347,7 +347,7 @@ public class PlaylistManager implements ChannelEventListener */ 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;