diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-05-15 22:54:44 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-05-15 22:54:44 +0400 |
commit | 9704199a943cb7f7b4dc19f755dc60d8da55baa6 (patch) | |
tree | b9f8fafbc8bf393ad8e15a3db72e42c6ff8442ef /src/apps/mplayerc/PlayerPlaylistBar.cpp | |
parent | a283669d90fd4766dffe734be5a5998b7e57c52d (diff) |
legacy branch: merge r3071-r3107 from trunk
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/branches/legacy@3108 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/PlayerPlaylistBar.cpp')
-rw-r--r-- | src/apps/mplayerc/PlayerPlaylistBar.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp index f77a56bf8..aa3207efe 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.cpp +++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp @@ -32,6 +32,7 @@ #include "SaveTextFileDialog.h"
#include "PlayerPlaylistBar.h"
#include "SettingsDefines.h"
+#include "internal_filter_config.h"
IMPLEMENT_DYNAMIC(CPlayerPlaylistBar, CSizingControlBarG)
CPlayerPlaylistBar::CPlayerPlaylistBar()
@@ -263,9 +264,13 @@ void CPlayerPlaylistBar::ParsePlayList(CAtlList<CString>& fns, CAtlList<CString> if(ct == "application/x-mpc-playlist") {
ParseMPCPlayList(fns.GetHead());
return;
- } else if(ct == "application/x-bdmv-playlist" && s.SrcFilters[SRC_MPEG]) {
- ParseBDMVPlayList(fns.GetHead());
- return;
+ } else {
+#if INTERNAL_SOURCEFILTER_MPEG
+ if(ct == "application/x-bdmv-playlist" && s.SrcFilters[SRC_MPEG]) {
+ ParseBDMVPlayList(fns.GetHead());
+ return;
+ }
+#endif
}
AddItem(fns, subs);
|