diff options
| author | Aleksoid <aleksoid@users.sourceforge.net> | 2010-06-21 03:13:41 +0400 |
|---|---|---|
| committer | Aleksoid <aleksoid@users.sourceforge.net> | 2010-06-21 03:13:41 +0400 |
| commit | cf07320495669b33ab301227664be41b57131514 (patch) | |
| tree | 018580ba41c7081055a08a41654f90bf78132bc3 | |
| parent | a791f510d2ffe3faad34fb76fd9186dae51b1a8a (diff) | |
Added : VP8 CLSID;
Fix : Open file with Dub & "Keep history of recently opened files";
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2067 10f7b99b-c216-0410-bff0-8a66a9350fd8
| -rw-r--r-- | include/moreuuids.h | 3 | ||||
| -rw-r--r-- | src/apps/mplayerc/PlayerPlaylistBar.cpp | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/moreuuids.h b/include/moreuuids.h index 68fb523ab..9a153aa76 100644 --- a/include/moreuuids.h +++ b/include/moreuuids.h @@ -86,6 +86,9 @@ DEFINE_GUID(MEDIASUBTYPE_AMR, DEFINE_GUID(MEDIASUBTYPE_SAMR,
0x726D6173, 0x000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(MEDIASUBTYPE_VP80 ,
+0x30385056, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+
DEFINE_GUID(MEDIASUBTYPE_IMA4,
0x34616D69, 0x000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
// {34616D69-0000-0010-8000-00AA00389B71}
diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp index 980fd5258..bc064a0b2 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.cpp +++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp @@ -444,14 +444,7 @@ void CPlayerPlaylistBar::Empty() void CPlayerPlaylistBar::Open(CAtlList<CString>& fns, bool fMulti, CAtlList<CString>* subs)
{
- if (!fMulti)
- {
- ASSERT(fns.GetCount() == 1 || fns.GetCount() == 2 && fns.GetTail().IsEmpty());
- ResolveLinkFiles(fns);
- if (SelectFileInPlaylist(fns.GetHead().GetString()))
- return;
- }
-
+ ResolveLinkFiles(fns);
Empty();
Append(fns, fMulti, subs);
}
|