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 | |
| 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')
124 files changed, 517 insertions, 338 deletions
diff --git a/src/apps/mplayerc/AppSettings.h b/src/apps/mplayerc/AppSettings.h index 14a70cd56..300c2def9 100644 --- a/src/apps/mplayerc/AppSettings.h +++ b/src/apps/mplayerc/AppSettings.h @@ -426,8 +426,16 @@ public: CMediaFormats m_Formats;
+#if HAS_SOURCEFILTERS
bool SrcFilters[SRC_LAST];
+#else
+ bool SrcFilters[1];
+#endif
+#if HAS_OTHER_DECODERS | HAS_FFMPEG_DECODERS
bool TraFilters[TRA_LAST];
+#else
+ bool TraFilters[1];
+#endif
#if HAS_DXVA_VIDEO_DECODERS
bool DXVAFilters[TRA_DXVA_LAST];
#else
@@ -531,8 +539,16 @@ private : FILE_POSITION FilePosition[MAX_FILE_POSITION];
int nCurrentFilePosition;
+#if HAS_SOURCEFILTERS
CString SrcFiltersKeys[SRC_LAST];
+#else
+ CString SrcFiltersKeys[1];
+#endif
+#if HAS_OTHER_DECODERS | HAS_FFMPEG_DECODERS
CString TraFiltersKeys[TRA_LAST];
+#else
+ CString TraFiltersKeys[1];
+#endif
#if HAS_DXVA_VIDEO_DECODERS
CString DXVAFiltersKeys[TRA_DXVA_LAST];
#else
diff --git a/src/apps/mplayerc/Changelog.txt b/src/apps/mplayerc/Changelog.txt index e19bf3450..7e0c0a996 100644 --- a/src/apps/mplayerc/Changelog.txt +++ b/src/apps/mplayerc/Changelog.txt @@ -9,15 +9,24 @@ next version - not yet released CHANGED: Updated ZenLib to v0.4.19
CHANGED: Updated SoundTouch to v1.5.1pre r104
CHANGED: Updated Little CMS to v2.2a
+ FIXED : Ticket #285, Ambarella AVC not correctly splitted by MPC-HC's internal
+ MP4/MOV source filter
+ FIXED : Ticket #384, disable Relative drive
FIXED : Ticket #640, Source tree refactoring
FIXED : Ticket #740, Make EVR Sync stats better looking
FIXED : Ticket #760, Fixed playback of old movs with 'raw', 'twos' and 'ima4' audio
+ FIXED : Ticket #805, EVR Custom scanline and refresh rate detection fails occasionally,
+ causing superspeed video
+ FIXED : Ticket #829, MPC-HC plays recent BBC HD recordings with no video
FIXED : Ticket #965, Add Full File Path Parameter to Status.html
FIXED : Ticket #989, Sliders at options are consistent with volume slider.
Scroll/button up will move slider up (increase the value) while going
other way, scroll/button down will decrease the value.
- FIXED : Ticket #1128, Thumbnails wider than 2048
+ FIXED : Ticket #1029, MPEG-2 Profile detected incorrectly with MPEG splitter
+ FIXED : Ticket #1032, MPC-HC64 does not work with Flash 64-bit
+ FIXED : Ticket #1128, Thumbnails wider than 2048p
FIXED : Ticket #1220, MPC fails to play specific MKV files
+ FIXED : Ticket #1321, IMpegSplitterFilter uses CString - should be WCHAR or BSTR instead
v1.5.1.2903 - 29 February 2011
diff --git a/src/apps/mplayerc/FGFilter.cpp b/src/apps/mplayerc/FGFilter.cpp index 1b4d2eb42..72623e3b7 100644 --- a/src/apps/mplayerc/FGFilter.cpp +++ b/src/apps/mplayerc/FGFilter.cpp @@ -344,11 +344,13 @@ void CFGFilterRegistry::ExtractFilterData(BYTE* p, UINT len) WORD pi = *(WORD*)p;
p += 2;
ASSERT(pi == 'ip');
+ UNREFERENCED_PARAMETER(pi);
ChkLen(1)
BYTE x33 = *p;
p++;
ASSERT(x33 == 0x33);
+ UNREFERENCED_PARAMETER(x33);
ChkLen(8)
bool fOutput = !!(*p®_PINFLAG_B_OUTPUT);
@@ -367,11 +369,13 @@ void CFGFilterRegistry::ExtractFilterData(BYTE* p, UINT len) WORD ty = *(WORD*)p;
p += 2;
ASSERT(ty == 'yt');
+ UNREFERENCED_PARAMETER(ty);
ChkLen(5)
BYTE x33 = *p;
p++;
ASSERT(x33 == 0x33);
+ UNREFERENCED_PARAMETER(x33);
p += 4;
ChkLen(8)
@@ -563,6 +567,7 @@ POSITION CFGFilterList::GetHeadPosition() }
}
+#ifdef _DEBUG
TRACE(_T("FGM: Sorting filters\n"));
POSITION pos = m_sortedfilters.GetHeadPosition();
@@ -570,6 +575,7 @@ POSITION CFGFilterList::GetHeadPosition() CFGFilter* pFGF = m_sortedfilters.GetNext(pos);
TRACE(_T("FGM: - %016I64x '%s'\n"), pFGF->GetMerit(), pFGF->GetName().IsEmpty() ? CStringFromGUID(pFGF->GetCLSID()) : CString(pFGF->GetName()));
}
+#endif
return m_sortedfilters.GetHeadPosition();
}
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index 845a08234..302840d64 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -9082,12 +9082,14 @@ void CMainFrame::SetDefaultWindowRect(int iMonitor) POINT ptA;
ptA.x = s.rcLastWindowPos.TopLeft().x;
ptA.y = s.rcLastWindowPos.TopLeft().y;
-
- for ( int i = 0; i < monitors.GetCount(); i++ ) {
- monitor = monitors.GetMonitor( i );
- if(monitor.IsOnMonitor(ptA)) {
- inmonitor = true;
- break;
+ inmonitor = (ptA.x<0 || ptA.y<0);
+ if(!inmonitor) {
+ for ( int i = 0; i < monitors.GetCount(); i++ ) {
+ monitor = monitors.GetMonitor( i );
+ if(monitor.IsOnMonitor(ptA)) {
+ inmonitor = true;
+ break;
+ }
}
}
}
@@ -10100,9 +10102,6 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) }
}
} else if(engine == ShockWave) {
-#ifdef _WIN64 // No flash on x64
- MessageBox(ResStr(IDS_MAINFRM_76), _T(""), MB_OK);
-#else
pUnk = (IUnknown*)(INonDelegatingUnknown*)DNew CShockwaveGraph(m_pVideoWnd->m_hWnd, hr);
if(!pUnk) {
throw ResStr(IDS_AG_OUT_OF_MEMORY);
@@ -10115,7 +10114,6 @@ void CMainFrame::OpenCreateGraphObject(OpenMediaData* pOMD) throw ResStr(IDS_MAINFRM_77);
}
m_fShockwaveGraph = true;
-#endif
} else if(engine == QuickTime) {
#ifdef _WIN64 // TODOX64
// MessageBox (ResStr(IDS_MAINFRM_78), _T(""), MB_OK);
@@ -13339,7 +13337,7 @@ void CMainFrame::SeekTo(REFERENCE_TIME rtPos, bool fSeekToKeyFrame) m_wndSeekBar.GetRange(start, stop);
GUID tf;
pMS->GetTimeFormat(&tf);
- if(start && stop) rtPos = min(rtPos, stop);
+ if(rtPos > stop && stop != 100) rtPos = stop;
m_wndStatusBar.SetStatusTimer(rtPos, stop, !!m_wndSubresyncBar.IsWindowVisible(), &tf);
m_OSD.DisplayMessage(OSD_TOPLEFT, m_wndStatusBar.GetStatusTimer(), 1500);
}
diff --git a/src/apps/mplayerc/MediaFormats.cpp b/src/apps/mplayerc/MediaFormats.cpp index dce97201f..87faeec45 100644 --- a/src/apps/mplayerc/MediaFormats.cpp +++ b/src/apps/mplayerc/MediaFormats.cpp @@ -202,7 +202,8 @@ void CMediaFormats::UpdateData(bool fSave) ADDFMT((ResStr(IDS_MEDIAFORMATS_17), _T("mkv")));
ADDFMT((_T("WebM video file"), _T("webm")));
ADDFMT((ResStr(IDS_MEDIAFORMATS_0), _T("wmv wmp wm asf")));
- ADDFMT((ResStr(IDS_MEDIAFORMATS_4), _T("mpg mpeg mpe m1v m2v mpv2 mp2v ts tp tpr pva m2ts m2t mts evo m2p")));
+ ADDFMT((ResStr(IDS_MEDIAFORMATS_4), _T("mpg mpeg mpe m1v m2v mpv2 mp2v pva evo m2p")));
+ ADDFMT((ResStr(IDS_MEDIAFORMATS_37), _T("ts tp trp m2t m2ts mts")));
ADDFMT((_T("VCD file"), _T("dat")));
ADDFMT((ResStr(IDS_AG_DVD_FILE), _T("vob ifo")));
ADDFMT((ResStr(IDS_MEDIAFORMATS_10), _T("ogm ogv")));
diff --git a/src/apps/mplayerc/Mpeg2SectionData.cpp b/src/apps/mplayerc/Mpeg2SectionData.cpp index b58ba1990..9460cd87f 100644 --- a/src/apps/mplayerc/Mpeg2SectionData.cpp +++ b/src/apps/mplayerc/Mpeg2SectionData.cpp @@ -38,7 +38,8 @@ #define SkipDescriptor(gb, nType, nLength) \
gb.ReadBuffer(DescBuffer, nLength); \
- TRACE ("Skipped descriptor : 0x%02x\n", nType);
+ TRACE ("Skipped descriptor : 0x%02x\n", nType); \
+ UNREFERENCED_PARAMETER(nType);
#define EndEnumDescriptors }}
diff --git a/src/apps/mplayerc/PPageInternalFilters.cpp b/src/apps/mplayerc/PPageInternalFilters.cpp index 58ded729b..e9a133b77 100644 --- a/src/apps/mplayerc/PPageInternalFilters.cpp +++ b/src/apps/mplayerc/PPageInternalFilters.cpp @@ -432,6 +432,7 @@ BOOL CPPageInternalFilters::OnInitDialog() break;
default:
l = NULL;
+ checked = false;
}
if (l) {
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.h b/src/apps/mplayerc/PlayerCaptureDialog.h index 046953cf8..cab61cc2c 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.h +++ b/src/apps/mplayerc/PlayerCaptureDialog.h @@ -57,7 +57,7 @@ public: virtual ~CFormatArray() {}
CFormat<T>* Find(CString name, bool fCreate = false) {
- for(int i = 0; i < (int)GetCount(); i++) {
+ for(size_t i = 0; i < GetCount(); ++i) {
if(GetAt(i)->name == name) {
return(GetAt(i));
}
@@ -78,9 +78,9 @@ public: return(false);
}
- for(int i = 0; i < (int)GetCount(); i++) {
+ for(size_t i = 0; i < GetCount(); ++i) {
CFormat<T>* pf = GetAt(i);
- for(int j = 0; j < (int)pf->GetCount(); j++) {
+ for(size_t j = 0; j < pf->GetCount(); ++j) {
CFormatElem<T>* pfe = pf->GetAt(j);
if(!pmt || (pfe->mt.majortype == pmt->majortype && pfe->mt.subtype == pmt->subtype)) {
if(ppf) {
@@ -99,9 +99,9 @@ public: return(false);
}
- for(int i = 0; i < (int)GetCount(); i++) {
+ for(size_t i = 0; i < GetCount(); ++i) {
CFormat<T>* pf = GetAt(i);
- for(int j = 0; j < (int)pf->GetCount(); j++) {
+ for(size_t j = 0; j < pf->GetCount(); ++j) {
CFormatElem<T>* pfe = pf->GetAt(j);
if((!pmt || pfe->mt == *pmt) && (!pcaps || !memcmp(pcaps, &pfe->caps, sizeof(T)))) {
if(ppf) {
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);
diff --git a/src/apps/mplayerc/SaveDlg.cpp b/src/apps/mplayerc/SaveDlg.cpp index 7e0c909a4..5d59e0d36 100644 --- a/src/apps/mplayerc/SaveDlg.cpp +++ b/src/apps/mplayerc/SaveDlg.cpp @@ -171,10 +171,19 @@ BOOL CSaveDlg::OnInitDialog() hr = pGB->Connect(
GetFirstPin((pSrc), PINDIR_OUTPUT),
GetFirstPin((pMid), PINDIR_INPUT));
+
+ if (FAILED(hr)) {
+ m_report.SetWindowText(_T("Error Connect pSrc / pMid"));
+ return FALSE;
+ }
hr = pGB->Connect(
GetFirstPin((pMid), PINDIR_OUTPUT),
GetFirstPin((pDst), PINDIR_INPUT));
+ if (FAILED(hr)) {
+ m_report.SetWindowText(_T("Error Connect pMid / pDst"));
+ return FALSE;
+ }
pMS = pMid;
diff --git a/src/apps/mplayerc/ShockwaveGraph.cpp b/src/apps/mplayerc/ShockwaveGraph.cpp index 0a701d4e3..d7467dbcc 100644 --- a/src/apps/mplayerc/ShockwaveGraph.cpp +++ b/src/apps/mplayerc/ShockwaveGraph.cpp @@ -71,7 +71,7 @@ STDMETHODIMP CShockwaveGraph::Run() try {
// XXX - Does the following line have some side effect
// or is the variable unused?
- long scale_mode = this->m_wndDestFrame.get_ScaleMode();
+ /*long scale_mode = */this->m_wndDestFrame.get_ScaleMode();
if(m_fs != State_Running) {
m_wndDestFrame.Play();
diff --git a/src/apps/mplayerc/TunerScanDlg.cpp b/src/apps/mplayerc/TunerScanDlg.cpp index 24c19617c..0c98f7aa7 100644 --- a/src/apps/mplayerc/TunerScanDlg.cpp +++ b/src/apps/mplayerc/TunerScanDlg.cpp @@ -118,7 +118,7 @@ void CTunerScanDlg::OnBnClickedSave() AppSettings& s = AfxGetAppSettings();
s.m_DVBChannels.RemoveAll();
- for (int i=0; i <m_ChannelList.GetItemCount(); i++) {
+ for (int i = 0; i < m_ChannelList.GetItemCount(); i++) {
CDVBChannel Channel;
Channel.FromString (m_ChannelList.GetItemText (i, TSCC_CHANNEL));
Channel.SetPrefNumber(i);
diff --git a/src/apps/mplayerc/VMROSD.h b/src/apps/mplayerc/VMROSD.h index 193cf3842..117e2d2d7 100644 --- a/src/apps/mplayerc/VMROSD.h +++ b/src/apps/mplayerc/VMROSD.h @@ -76,6 +76,7 @@ private : CComPtr<IVMRMixerBitmap9> m_pVMB;
CComPtr<IMFVideoMixerBitmap> m_pMFVMB;
CComPtr<IMadVRTextOsd> m_pMVTO;
+
CWnd* m_pWnd;
CCritSec m_Lock;
diff --git a/src/apps/mplayerc/WebServer.cpp b/src/apps/mplayerc/WebServer.cpp index aeac3fad8..874b0c31f 100644 --- a/src/apps/mplayerc/WebServer.cpp +++ b/src/apps/mplayerc/WebServer.cpp @@ -481,6 +481,7 @@ void CWebServer::OnRequest(CWebClientSocket* pClient, CStringA& hdr, CStringA& b fseek(f, 0, 0);
int len = fread(s, 1, body.GetLength(), f);
ASSERT(len == body.GetLength());
+ UNREFERENCED_PARAMETER(len);
fclose(f);
DeleteFileA(fn);
diff --git a/src/apps/mplayerc/mpciconlib/icons/aac.ico b/src/apps/mplayerc/mpciconlib/icons/aac.ico Binary files differindex a513227a3..9fe172a46 100644 --- a/src/apps/mplayerc/mpciconlib/icons/aac.ico +++ b/src/apps/mplayerc/mpciconlib/icons/aac.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ac3.ico b/src/apps/mplayerc/mpciconlib/icons/ac3.ico Binary files differnew file mode 100644 index 000000000..0d543ea87 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/ac3.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/aiff.ico b/src/apps/mplayerc/mpciconlib/icons/aiff.ico Binary files differindex 81104f92b..46f0a096e 100644 --- a/src/apps/mplayerc/mpciconlib/icons/aiff.ico +++ b/src/apps/mplayerc/mpciconlib/icons/aiff.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/alac.ico b/src/apps/mplayerc/mpciconlib/icons/alac.ico Binary files differindex 410eea5f2..093128301 100644 --- a/src/apps/mplayerc/mpciconlib/icons/alac.ico +++ b/src/apps/mplayerc/mpciconlib/icons/alac.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/amr.ico b/src/apps/mplayerc/mpciconlib/icons/amr.ico Binary files differnew file mode 100644 index 000000000..de86bed61 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/amr.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ape.ico b/src/apps/mplayerc/mpciconlib/icons/ape.ico Binary files differnew file mode 100644 index 000000000..ef3d25110 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/ape.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/au.ico b/src/apps/mplayerc/mpciconlib/icons/au.ico Binary files differindex 8d11d5343..df410ba7d 100644 --- a/src/apps/mplayerc/mpciconlib/icons/au.ico +++ b/src/apps/mplayerc/mpciconlib/icons/au.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/avi.ico b/src/apps/mplayerc/mpciconlib/icons/avi.ico Binary files differindex e3ed4bcd8..962f7af32 100644 --- a/src/apps/mplayerc/mpciconlib/icons/avi.ico +++ b/src/apps/mplayerc/mpciconlib/icons/avi.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/bik.ico b/src/apps/mplayerc/mpciconlib/icons/bik.ico Binary files differdeleted file mode 100644 index d37bc710f..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/bik.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/bink.ico b/src/apps/mplayerc/mpciconlib/icons/bink.ico Binary files differnew file mode 100644 index 000000000..5a1d4c3db --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/bink.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/cda.ico b/src/apps/mplayerc/mpciconlib/icons/cda.ico Binary files differindex 3702a2f86..644ce9673 100644 --- a/src/apps/mplayerc/mpciconlib/icons/cda.ico +++ b/src/apps/mplayerc/mpciconlib/icons/cda.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/d2v.ico b/src/apps/mplayerc/mpciconlib/icons/d2v.ico Binary files differindex e8dac4993..be3eefef0 100644 --- a/src/apps/mplayerc/mpciconlib/icons/d2v.ico +++ b/src/apps/mplayerc/mpciconlib/icons/d2v.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/dat.ico b/src/apps/mplayerc/mpciconlib/icons/dat.ico Binary files differnew file mode 100644 index 000000000..e9276a39f --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/dat.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/dsm.ico b/src/apps/mplayerc/mpciconlib/icons/dsm.ico Binary files differindex 2f3fac41d..f43bc9714 100644 --- a/src/apps/mplayerc/mpciconlib/icons/dsm.ico +++ b/src/apps/mplayerc/mpciconlib/icons/dsm.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/dts.ico b/src/apps/mplayerc/mpciconlib/icons/dts.ico Binary files differnew file mode 100644 index 000000000..8bb4de24d --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/dts.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/dvda.ico b/src/apps/mplayerc/mpciconlib/icons/dvda.ico Binary files differdeleted file mode 100644 index e6e4636cc..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/dvda.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/dvdf.ico b/src/apps/mplayerc/mpciconlib/icons/dvdf.ico Binary files differdeleted file mode 100644 index f01cab14c..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/dvdf.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/flac.ico b/src/apps/mplayerc/mpciconlib/icons/flac.ico Binary files differindex e48fe2aef..3c76a5cab 100644 --- a/src/apps/mplayerc/mpciconlib/icons/flac.ico +++ b/src/apps/mplayerc/mpciconlib/icons/flac.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/flic.ico b/src/apps/mplayerc/mpciconlib/icons/flic.ico Binary files differindex 09a6f169c..189defb00 100644 --- a/src/apps/mplayerc/mpciconlib/icons/flic.ico +++ b/src/apps/mplayerc/mpciconlib/icons/flic.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/flv.ico b/src/apps/mplayerc/mpciconlib/icons/flv.ico Binary files differindex 1e8884903..0247c13cd 100644 --- a/src/apps/mplayerc/mpciconlib/icons/flv.ico +++ b/src/apps/mplayerc/mpciconlib/icons/flv.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/icon_list.txt b/src/apps/mplayerc/mpciconlib/icons/icon_list.txt index 28555f764..542718077 100644 --- a/src/apps/mplayerc/mpciconlib/icons/icon_list.txt +++ b/src/apps/mplayerc/mpciconlib/icons/icon_list.txt @@ -1,39 +1,49 @@ -("wmv"), _T("wmv wmp wm asf")
-("wma"), _T("wma")
-("avi"), _T("avi")
-("wav"), _T("wav")
-("mpg"), _T("mpg mpeg mpe m1v m2v mpv2 mp2v ts tp tpr pva pss m2ts m2t mts evo")
-("mpa"), _T("mpa mp2 m1a m2a")
-("dvdf"), _T("vob ifo")
-("dvda"), _T("ac3 dts")
-("mp3"), _T("mp3")
-("mid"), _T("mid midi rmi")
-("ivf"), _T("ivf")
+("aac"), _T("aac m4a m4b")
+("ac3"), _T("ac3")
("aiff"), _T("aif aifc aiff")
+("alac"), _T("alac")
+("amr"), _T("amr")
+("ape"), _T("ape apl")
("au"), _T("au snd")
-("ogm"), _T("ogm ogv")
-("ogg"), _T("ogg oga")
+("avi"), _T("avi")
+("bink"), _T("bik")
("cda"), _T("cda")
-("flic"), _T("fli flc flic")
("d2v"), _T("d2v")
-("mp4"), _T("mp4 m4v hdmov 3gp 3gpp")
-("aac"), _T("m4a m4b aac")
-("mkv"), _T("mkv")
+("dat"), _T("dat")
+("drc"), _T("drc")
+("dsm"), _T("dsm dsv dsa dss")
+("dts"), _T("dts")
+("flac"), _T("flac")
+("flic"), _T("fli flc flic")
+("flv"), _T("flv iflv f4v")
+("ifo"), _T("ifo")
+("ivf"), _T("ivf")
+("midi"), _T("mid midi rmi")
("mka"), _T("mka")
-("bik"), _T("smk bik")
-("ratdvd"), _T("ratdvd")
+("mkv"), _T("mkv")
+("mov"), _T("mov 3g2 3gp2")
+("mp3"), _T("mp3")
+("mp4"), _T("mp4 m4v mp4v mpv4 hdmov 3gp 3gpp")
+("mpa"), _T("mpa mp2 m1a m2a")
+("mpc"), _T("mpc")
+("mpeg"), _T("mpg mpeg mpe m1v m2v mpv2 mp2v pva evo m2p")
+("ofr"), _T("ofr ofs")
+("ogg"), _T("ogg oga")
+("ogm"), _T("ogm ogv")
+("playlist"), _T("asx m3u pls wvx wax wmx mpcpl mpls bdmv")
+("ra"), _T("ra")
+("rardvd"), _T("ratdvd")
("roq"), _T("roq")
("rm"), _T("rm ram rpm rmm")
-("ra"), _T("ra")
("rt"), _T("rt rp smi smil")
-("drc"), _T("drc")
-("dsm"), _T("dsm dsv dsa dss")
-("mpc"), _T("mpc")
-("flac"), _T("flac")
-("alac"), _T("alac")
-("flv"), _T("flv")
+("smk"), _T("smk")
("swf"), _T("swf")
-("mov"), _T("mov qt amr 3g2 3gp2")
-("jpeg"), _T("jpeg jpg bmp gif pic png dib tiff tif")
-("plc"), _T("asx m3u pls wvx wax wmx mpcpl")
-("other"), _T("divx vp6 rmvb amv webm")
\ No newline at end of file +("ts"), _T("ts tp trp m2t m2ts mts")
+("tta"), _T("tta")
+("vob"), _T("vob")
+("wav"), _T("wav")
+("webm"), _T("webm")
+("wma"), _T("wma")
+("wmv"), _T("wmv wmp wm asf")
+("wv"), _T("wv")
+("other"), _T("divx rmvb amv")
\ No newline at end of file diff --git a/src/apps/mplayerc/mpciconlib/icons/ifo.ico b/src/apps/mplayerc/mpciconlib/icons/ifo.ico Binary files differnew file mode 100644 index 000000000..e7b46437e --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/ifo.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ifv.ico b/src/apps/mplayerc/mpciconlib/icons/ifv.ico Binary files differdeleted file mode 100644 index 82375cd9c..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/ifv.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/ivf.ico b/src/apps/mplayerc/mpciconlib/icons/ivf.ico Binary files differnew file mode 100644 index 000000000..abbd32362 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/ivf.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/jpeg.ico b/src/apps/mplayerc/mpciconlib/icons/jpeg.ico Binary files differdeleted file mode 100644 index cd3045497..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/jpeg.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/mid.ico b/src/apps/mplayerc/mpciconlib/icons/mid.ico Binary files differdeleted file mode 100644 index 4468b18d8..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/mid.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/midi.ico b/src/apps/mplayerc/mpciconlib/icons/midi.ico Binary files differnew file mode 100644 index 000000000..3cd00547a --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/midi.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mka.ico b/src/apps/mplayerc/mpciconlib/icons/mka.ico Binary files differindex 595c45ddf..4695660f2 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mka.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mka.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mkv.ico b/src/apps/mplayerc/mpciconlib/icons/mkv.ico Binary files differindex 003c85298..756e98628 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mkv.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mkv.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mov.ico b/src/apps/mplayerc/mpciconlib/icons/mov.ico Binary files differindex 5c6670328..1e230a655 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mov.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mov.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mp3.ico b/src/apps/mplayerc/mpciconlib/icons/mp3.ico Binary files differindex de57e2135..66d3cdc3f 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mp3.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mp3.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mp4.ico b/src/apps/mplayerc/mpciconlib/icons/mp4.ico Binary files differindex 2a1cfb39b..4e4d3e06f 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mp4.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mp4.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mpa.ico b/src/apps/mplayerc/mpciconlib/icons/mpa.ico Binary files differindex aea3337bb..6392d3cac 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mpa.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mpa.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mpc.ico b/src/apps/mplayerc/mpciconlib/icons/mpc.ico Binary files differindex 8f4b5f3ad..4380f9b54 100644 --- a/src/apps/mplayerc/mpciconlib/icons/mpc.ico +++ b/src/apps/mplayerc/mpciconlib/icons/mpc.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mpeg.ico b/src/apps/mplayerc/mpciconlib/icons/mpeg.ico Binary files differnew file mode 100644 index 000000000..3336a7663 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/mpeg.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/mpg.ico b/src/apps/mplayerc/mpciconlib/icons/mpg.ico Binary files differdeleted file mode 100644 index 1f9ee287e..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/mpg.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/ofr.ico b/src/apps/mplayerc/mpciconlib/icons/ofr.ico Binary files differnew file mode 100644 index 000000000..ef0e20430 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/ofr.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ogg.ico b/src/apps/mplayerc/mpciconlib/icons/ogg.ico Binary files differindex 6424537e7..7ed51207e 100644 --- a/src/apps/mplayerc/mpciconlib/icons/ogg.ico +++ b/src/apps/mplayerc/mpciconlib/icons/ogg.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ogm.ico b/src/apps/mplayerc/mpciconlib/icons/ogm.ico Binary files differindex f006a3e82..2f2498efb 100644 --- a/src/apps/mplayerc/mpciconlib/icons/ogm.ico +++ b/src/apps/mplayerc/mpciconlib/icons/ogm.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/other.ico b/src/apps/mplayerc/mpciconlib/icons/other.ico Binary files differindex 7b63c2b90..393a712d3 100644 --- a/src/apps/mplayerc/mpciconlib/icons/other.ico +++ b/src/apps/mplayerc/mpciconlib/icons/other.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/playlist.ico b/src/apps/mplayerc/mpciconlib/icons/playlist.ico Binary files differnew file mode 100644 index 000000000..f909cc415 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/playlist.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/plc.ico b/src/apps/mplayerc/mpciconlib/icons/plc.ico Binary files differdeleted file mode 100644 index 68acfdd87..000000000 --- a/src/apps/mplayerc/mpciconlib/icons/plc.ico +++ /dev/null diff --git a/src/apps/mplayerc/mpciconlib/icons/ra.ico b/src/apps/mplayerc/mpciconlib/icons/ra.ico Binary files differindex ef2e486fe..e0bb4e5af 100644 --- a/src/apps/mplayerc/mpciconlib/icons/ra.ico +++ b/src/apps/mplayerc/mpciconlib/icons/ra.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ratdvd.ico b/src/apps/mplayerc/mpciconlib/icons/ratdvd.ico Binary files differindex cf745aa84..7d070739a 100644 --- a/src/apps/mplayerc/mpciconlib/icons/ratdvd.ico +++ b/src/apps/mplayerc/mpciconlib/icons/ratdvd.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/rm.ico b/src/apps/mplayerc/mpciconlib/icons/rm.ico Binary files differindex d90ea4ecc..784875a27 100644 --- a/src/apps/mplayerc/mpciconlib/icons/rm.ico +++ b/src/apps/mplayerc/mpciconlib/icons/rm.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/rt.ico b/src/apps/mplayerc/mpciconlib/icons/rt.ico Binary files differindex a0fed938a..777cc2a23 100644 --- a/src/apps/mplayerc/mpciconlib/icons/rt.ico +++ b/src/apps/mplayerc/mpciconlib/icons/rt.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/smk.ico b/src/apps/mplayerc/mpciconlib/icons/smk.ico Binary files differnew file mode 100644 index 000000000..37be8b7d1 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/smk.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/swf.ico b/src/apps/mplayerc/mpciconlib/icons/swf.ico Binary files differindex d863af772..f47e6abca 100644 --- a/src/apps/mplayerc/mpciconlib/icons/swf.ico +++ b/src/apps/mplayerc/mpciconlib/icons/swf.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/ts.ico b/src/apps/mplayerc/mpciconlib/icons/ts.ico Binary files differnew file mode 100644 index 000000000..ddce190a4 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/ts.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/tta.ico b/src/apps/mplayerc/mpciconlib/icons/tta.ico Binary files differnew file mode 100644 index 000000000..f3d116acb --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/tta.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/vob.ico b/src/apps/mplayerc/mpciconlib/icons/vob.ico Binary files differnew file mode 100644 index 000000000..6b38f5383 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/vob.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/wav.ico b/src/apps/mplayerc/mpciconlib/icons/wav.ico Binary files differindex 17067bde8..4b651a59a 100644 --- a/src/apps/mplayerc/mpciconlib/icons/wav.ico +++ b/src/apps/mplayerc/mpciconlib/icons/wav.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/webm.ico b/src/apps/mplayerc/mpciconlib/icons/webm.ico Binary files differnew file mode 100644 index 000000000..8a0805618 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/webm.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/wma.ico b/src/apps/mplayerc/mpciconlib/icons/wma.ico Binary files differindex 4a6de5338..a9c2a5040 100644 --- a/src/apps/mplayerc/mpciconlib/icons/wma.ico +++ b/src/apps/mplayerc/mpciconlib/icons/wma.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/wmv.ico b/src/apps/mplayerc/mpciconlib/icons/wmv.ico Binary files differindex b34b7c450..9c972b1b8 100644 --- a/src/apps/mplayerc/mpciconlib/icons/wmv.ico +++ b/src/apps/mplayerc/mpciconlib/icons/wmv.ico diff --git a/src/apps/mplayerc/mpciconlib/icons/wv.ico b/src/apps/mplayerc/mpciconlib/icons/wv.ico Binary files differnew file mode 100644 index 000000000..52c449e10 --- /dev/null +++ b/src/apps/mplayerc/mpciconlib/icons/wv.ico diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.cpp b/src/apps/mplayerc/mpciconlib/mpciconlib.cpp index e43b4ec63..63afd8885 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.cpp +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.cpp @@ -8,212 +8,230 @@ int main() int get_icon_index(CString ext)
{
- int iconindex = -1;
+ int iconindex = -1;// IDI_NONE
if(ext.CompareNoCase(_T(".3g2")) == 0) {
+ iconindex = IDI_MOV_ICON;
+ }else if(ext.CompareNoCase(_T(".3gp")) == 0) {
iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".3gp")) == 0) {
- iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".3gp2")) == 0) {
- iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".3gpp")) == 0) {
+ }else if(ext.CompareNoCase(_T(".3gp2")) == 0) {
+ iconindex = IDI_MOV_ICON;
+ }else if(ext.CompareNoCase(_T(".3gpp")) == 0) {
iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".aac")) == 0) {
+ }else if(ext.CompareNoCase(_T(".aac")) == 0) {
iconindex = IDI_AAC_ICON;
- } else if(ext.CompareNoCase(_T(".ac3")) == 0) {
- iconindex = IDI_DVDA_ICON;
- } else if(ext.CompareNoCase(_T(".aif")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ac3")) == 0) {
+ iconindex = IDI_AC3_ICON;
+ }else if(ext.CompareNoCase(_T(".aif")) == 0) {
iconindex = IDI_AIFF_ICON;
- } else if(ext.CompareNoCase(_T(".aifc")) == 0) {
+ }else if(ext.CompareNoCase(_T(".aifc")) == 0) {
iconindex = IDI_AIFF_ICON;
- } else if(ext.CompareNoCase(_T(".aiff")) == 0) {
+ }else if(ext.CompareNoCase(_T(".aiff")) == 0) {
iconindex = IDI_AIFF_ICON;
- } else if(ext.CompareNoCase(_T(".alac")) == 0) {
+ }else if(ext.CompareNoCase(_T(".alac")) == 0) {
iconindex = IDI_ALAC_ICON;
- } else if(ext.CompareNoCase(_T(".amr")) == 0) {
+ }else if(ext.CompareNoCase(_T(".amr")) == 0) {
+ iconindex = IDI_AMR_ICON;
+ }else if(ext.CompareNoCase(_T(".amv")) == 0) {
iconindex = IDI_OTHER_ICON;
- } else if(ext.CompareNoCase(_T(".amv")) == 0) {
- iconindex = IDI_OTHER_ICON;
- } else if(ext.CompareNoCase(_T(".ape")) == 0) {
- iconindex = IDI_NONE;
- } else if(ext.CompareNoCase(_T(".asf")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ape")) == 0) {
+ iconindex = IDI_APE_ICON;
+ }else if(ext.CompareNoCase(_T(".apl")) == 0) {
+ iconindex = IDI_APE_ICON;
+ }else if(ext.CompareNoCase(_T(".asf")) == 0) {
iconindex = IDI_WMV_ICON;
- } else if(ext.CompareNoCase(_T(".asx")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".au")) == 0) {
+ }else if(ext.CompareNoCase(_T(".asx")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".au")) == 0) {
iconindex = IDI_AU_ICON;
- } else if(ext.CompareNoCase(_T(".avi")) == 0) {
+ }else if(ext.CompareNoCase(_T(".avi")) == 0) {
iconindex = IDI_AVI_ICON;
- } else if(ext.CompareNoCase(_T(".bik")) == 0) {
- iconindex = IDI_BIK_ICON;
- } else if(ext.CompareNoCase(_T(".cda")) == 0) {
+ }else if(ext.CompareNoCase(_T(".bdmv")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".bik")) == 0) {
+ iconindex = IDI_BINK_ICON;
+ }else if(ext.CompareNoCase(_T(".cda")) == 0) {
iconindex = IDI_CDA_ICON;
- } else if(ext.CompareNoCase(_T(".d2v")) == 0) {
+ }else if(ext.CompareNoCase(_T(".d2v")) == 0) {
iconindex = IDI_D2V_ICON;
- } else if(ext.CompareNoCase(_T(".divx")) == 0) {
- iconindex = IDI_AVI_ICON;
- } else if(ext.CompareNoCase(_T(".drc")) == 0) {
+ }else if(ext.CompareNoCase(_T(".dat")) == 0) {
+ iconindex = IDI_DAT_ICON;
+ }else if(ext.CompareNoCase(_T(".divx")) == 0) {
+ iconindex = IDI_OTHER_ICON;
+ }else if(ext.CompareNoCase(_T(".drc")) == 0) {
iconindex = IDI_DRC_ICON;
- } else if(ext.CompareNoCase(_T(".dsa")) == 0) {
+ }else if(ext.CompareNoCase(_T(".dsa")) == 0) {
iconindex = IDI_DSM_ICON;
- } else if(ext.CompareNoCase(_T(".dsm")) == 0) {
+ }else if(ext.CompareNoCase(_T(".dsm")) == 0) {
iconindex = IDI_DSM_ICON;
- } else if(ext.CompareNoCase(_T(".dss")) == 0) {
+ }else if(ext.CompareNoCase(_T(".dss")) == 0) {
iconindex = IDI_DSM_ICON;
- } else if(ext.CompareNoCase(_T(".dsv")) == 0) {
+ }else if(ext.CompareNoCase(_T(".dsv")) == 0) {
iconindex = IDI_DSM_ICON;
- } else if(ext.CompareNoCase(_T(".dts")) == 0) {
- iconindex = IDI_DVDA_ICON;
- } else if(ext.CompareNoCase(_T(".evo")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".flac")) == 0) {
+ }else if(ext.CompareNoCase(_T(".dts")) == 0) {
+ iconindex = IDI_DTS_ICON;
+ }else if(ext.CompareNoCase(_T(".evo")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".f4v")) == 0) {
+ iconindex = IDI_FLV_ICON;
+ }else if(ext.CompareNoCase(_T(".flac")) == 0) {
iconindex = IDI_FLAC_ICON;
- } else if(ext.CompareNoCase(_T(".flic")) == 0) {
+ }else if(ext.CompareNoCase(_T(".flc")) == 0) {
iconindex = IDI_FLIC_ICON;
- } else if(ext.CompareNoCase(_T(".flv")) == 0) {
- iconindex = IDI_FLV_ICON;
- } else if(ext.CompareNoCase(_T(".iflv")) == 0) {
- iconindex = IDI_FLV_ICON;
- } else if(ext.CompareNoCase(_T(".f4v")) == 0) {
+ }else if(ext.CompareNoCase(_T(".fli")) == 0) {
+ iconindex = IDI_FLIC_ICON;
+ }else if(ext.CompareNoCase(_T(".flic")) == 0) {
+ iconindex = IDI_FLIC_ICON;
+ }else if(ext.CompareNoCase(_T(".flv")) == 0) {
iconindex = IDI_FLV_ICON;
- } else if(ext.CompareNoCase(_T(".hdmov")) == 0) {
+ }else if(ext.CompareNoCase(_T(".hdmov")) == 0) {
iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".ifo")) == 0) {
- iconindex = IDI_DVDF_ICON;
- } else if(ext.CompareNoCase(_T(".ivf")) == 0) {
+ }else if(ext.CompareNoCase(_T(".iflv")) == 0) {
+ iconindex = IDI_FLV_ICON;
+ }else if(ext.CompareNoCase(_T(".ifo")) == 0) {
+ iconindex = IDI_IFO_ICON;
+ }else if(ext.CompareNoCase(_T(".ivf")) == 0) {
iconindex = IDI_IVF_ICON;
- } else if(ext.CompareNoCase(_T(".m1a")) == 0) {
+ }else if(ext.CompareNoCase(_T(".m1a")) == 0) {
iconindex = IDI_MPA_ICON;
- } else if(ext.CompareNoCase(_T(".m1v")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".m2a")) == 0) {
+ }else if(ext.CompareNoCase(_T(".m1v")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".m2a")) == 0) {
iconindex = IDI_MPA_ICON;
- } else if(ext.CompareNoCase(_T(".m2t")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".m2ts")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".m2v")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".m3u")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".bdmv")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".m4a")) == 0) {
+ }else if(ext.CompareNoCase(_T(".m2p")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".m2t")) == 0) {
+ iconindex = IDI_TS_ICON;
+ }else if(ext.CompareNoCase(_T(".m2ts")) == 0) {
+ iconindex = IDI_TS_ICON;
+ }else if(ext.CompareNoCase(_T(".m2v")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".m3u")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".m4a")) == 0) {
iconindex = IDI_AAC_ICON;
- } else if(ext.CompareNoCase(_T(".m4b")) == 0) {
+ }else if(ext.CompareNoCase(_T(".m4b")) == 0) {
iconindex = IDI_AAC_ICON;
- } else if(ext.CompareNoCase(_T(".m4v")) == 0) {
+ }else if(ext.CompareNoCase(_T(".m4v")) == 0) {
iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".mid")) == 0) {
- iconindex = IDI_MID_ICON;
- } else if(ext.CompareNoCase(_T(".midi")) == 0) {
- iconindex = IDI_MID_ICON;
- } else if(ext.CompareNoCase(_T(".mka")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mid")) == 0) {
+ iconindex = IDI_MIDI_ICON;
+ }else if(ext.CompareNoCase(_T(".midi")) == 0) {
+ iconindex = IDI_MIDI_ICON;
+ }else if(ext.CompareNoCase(_T(".mka")) == 0) {
iconindex = IDI_MKA_ICON;
- } else if(ext.CompareNoCase(_T(".mkv")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mkv")) == 0) {
iconindex = IDI_MKV_ICON;
- } else if(ext.CompareNoCase(_T(".mov")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mov")) == 0) {
iconindex = IDI_MOV_ICON;
- } else if(ext.CompareNoCase(_T(".mp2")) == 0) {
- iconindex = IDI_MPC_ICON;
- } else if(ext.CompareNoCase(_T(".mp2v")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".mp3")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mp2")) == 0) {
+ iconindex = IDI_MPA_ICON;
+ }else if(ext.CompareNoCase(_T(".mp2v")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".mp3")) == 0) {
iconindex = IDI_MP3_ICON;
- } else if(ext.CompareNoCase(_T(".mp4")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mp4")) == 0) {
+ iconindex = IDI_MP4_ICON;
+ }else if(ext.CompareNoCase(_T(".mp4v")) == 0) {
iconindex = IDI_MP4_ICON;
- } else if(ext.CompareNoCase(_T(".mpa")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mpa")) == 0) {
iconindex = IDI_MPA_ICON;
- } else if(ext.CompareNoCase(_T(".mpc")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mpc")) == 0) {
iconindex = IDI_MPC_ICON;
- } else if(ext.CompareNoCase(_T(".mpcpl")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".mpe")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".mpeg")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".mpg")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".mpv2")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".mts")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".oga")) == 0) {
+ }else if(ext.CompareNoCase(_T(".mpcpl")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".mpe")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".mpeg")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".mpg")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".mpls")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".mpv2")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".mpv4")) == 0) {
+ iconindex = IDI_MP4_ICON;
+ }else if(ext.CompareNoCase(_T(".mts")) == 0) {
+ iconindex = IDI_TS_ICON;
+ }else if(ext.CompareNoCase(_T(".ofr")) == 0) {
+ iconindex = IDI_OFR_ICON;
+ }else if(ext.CompareNoCase(_T(".ofs")) == 0) {
+ iconindex = IDI_OFR_ICON;
+ }else if(ext.CompareNoCase(_T(".oga")) == 0) {
iconindex = IDI_OGG_ICON;
- } else if(ext.CompareNoCase(_T(".ogg")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ogg")) == 0) {
iconindex = IDI_OGG_ICON;
- } else if(ext.CompareNoCase(_T(".ogm")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ogm")) == 0) {
iconindex = IDI_OGM_ICON;
- } else if(ext.CompareNoCase(_T(".ogv")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ogv")) == 0) {
iconindex = IDI_OGM_ICON;
- } else if(ext.CompareNoCase(_T(".pls")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".pva")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".pss")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".qt")) == 0) {
- iconindex = IDI_MOV_ICON;
- } else if(ext.CompareNoCase(_T(".ra")) == 0) {
+ }else if(ext.CompareNoCase(_T(".pls")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".pva")) == 0) {
+ iconindex = IDI_MPEG_ICON;
+ }else if(ext.CompareNoCase(_T(".ra")) == 0) {
iconindex = IDI_RA_ICON;
- } else if(ext.CompareNoCase(_T(".ram")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ram")) == 0) {
iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".ratdvd")) == 0) {
+ }else if(ext.CompareNoCase(_T(".ratdvd")) == 0) {
iconindex = IDI_RATDVD_ICON;
- } else if(ext.CompareNoCase(_T(".rm")) == 0) {
+ }else if(ext.CompareNoCase(_T(".rm")) == 0) {
iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".rmi")) == 0) {
- iconindex = IDI_MID_ICON;
- } else if(ext.CompareNoCase(_T(".rmm")) == 0) {
+ }else if(ext.CompareNoCase(_T(".rmi")) == 0) {
+ iconindex = IDI_MIDI_ICON;
+ }else if(ext.CompareNoCase(_T(".rmm")) == 0) {
iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".rmvb")) == 0) {
- iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".roq")) == 0) {
+ }else if(ext.CompareNoCase(_T(".rmvb")) == 0) {
+ iconindex = IDI_OTHER_ICON;
+ }else if(ext.CompareNoCase(_T(".roq")) == 0) {
iconindex = IDI_ROQ_ICON;
- } else if(ext.CompareNoCase(_T(".rp")) == 0) {
+ }else if(ext.CompareNoCase(_T(".rp")) == 0) {
iconindex = IDI_RT_ICON;
- } else if(ext.CompareNoCase(_T(".rpm")) == 0) {
+ }else if(ext.CompareNoCase(_T(".rpm")) == 0) {
iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".rt")) == 0) {
+ }else if(ext.CompareNoCase(_T(".rt")) == 0) {
iconindex = IDI_RT_ICON;
- } else if(ext.CompareNoCase(_T(".smi")) == 0) {
- iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".smil")) == 0) {
- iconindex = IDI_RM_ICON;
- } else if(ext.CompareNoCase(_T(".smk")) == 0) {
- iconindex = IDI_OTHER_ICON;
- } else if(ext.CompareNoCase(_T(".snd")) == 0) {
+ }else if(ext.CompareNoCase(_T(".smi")) == 0) {
+ iconindex = IDI_RT_ICON;
+ }else if(ext.CompareNoCase(_T(".smil")) == 0) {
+ iconindex = IDI_RT_ICON;
+ }else if(ext.CompareNoCase(_T(".smk")) == 0) {
+ iconindex = IDI_SMK_ICON;
+ }else if(ext.CompareNoCase(_T(".snd")) == 0) {
iconindex = IDI_AU_ICON;
- } else if(ext.CompareNoCase(_T(".tp")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".tpr")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".ts")) == 0) {
- iconindex = IDI_MPG_ICON;
- } else if(ext.CompareNoCase(_T(".vob")) == 0) {
- iconindex = IDI_DVDF_ICON;
- } else if(ext.CompareNoCase(_T(".vp6")) == 0) {
- iconindex = IDI_OTHER_ICON;
- } else if(ext.CompareNoCase(_T(".wav")) == 0) {
+ }else if(ext.CompareNoCase(_T(".swf")) == 0) {
+ iconindex = IDI_SWF_ICON;
+ }else if(ext.CompareNoCase(_T(".tp")) == 0) {
+ iconindex = IDI_TS_ICON;
+ }else if(ext.CompareNoCase(_T(".trp")) == 0) {
+ iconindex = IDI_TS_ICON;
+ }else if(ext.CompareNoCase(_T(".ts")) == 0) {
+ iconindex = IDI_TS_ICON;
+ }else if(ext.CompareNoCase(_T(".tta")) == 0) {
+ iconindex = IDI_TTA_ICON;
+ }else if(ext.CompareNoCase(_T(".vob")) == 0) {
+ iconindex = IDI_VOB_ICON;
+ }else if(ext.CompareNoCase(_T(".wav")) == 0) {
iconindex = IDI_WAV_ICON;
- } else if(ext.CompareNoCase(_T(".wax")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".webm")) == 0) {
- iconindex = IDI_OTHER_ICON;
- } else if(ext.CompareNoCase(_T(".wm")) == 0) {
+ }else if(ext.CompareNoCase(_T(".wax")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".webm")) == 0) {
+ iconindex = IDI_WEBM_ICON;
+ }else if(ext.CompareNoCase(_T(".wm")) == 0) {
iconindex = IDI_WMV_ICON;
- } else if(ext.CompareNoCase(_T(".wma")) == 0) {
+ }else if(ext.CompareNoCase(_T(".wma")) == 0) {
iconindex = IDI_WMA_ICON;
- } else if(ext.CompareNoCase(_T(".wmp")) == 0) {
+ }else if(ext.CompareNoCase(_T(".wmp")) == 0) {
iconindex = IDI_WMV_ICON;
- } else if(ext.CompareNoCase(_T(".wmv")) == 0) {
+ }else if(ext.CompareNoCase(_T(".wmv")) == 0) {
iconindex = IDI_WMV_ICON;
- } else if(ext.CompareNoCase(_T(".wmx")) == 0) {
- iconindex = IDI_PLC_ICON;
- } else if(ext.CompareNoCase(_T(".wv")) == 0) {
- iconindex = IDI_NONE;
- } else if(ext.CompareNoCase(_T(".wvx")) == 0) {
- iconindex = IDI_PLC_ICON;
+ }else if(ext.CompareNoCase(_T(".wmx")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
+ }else if(ext.CompareNoCase(_T(".wv")) == 0) {
+ iconindex = IDI_WV_ICON;
+ }else if(ext.CompareNoCase(_T(".wvx")) == 0) {
+ iconindex = IDI_PLAYLIST_ICON;
}
return iconindex;
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.h b/src/apps/mplayerc/mpciconlib/mpciconlib.h index 02a697776..159a6c151 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.h +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.h @@ -4,44 +4,55 @@ * when adding/removing icons.
*/
-#define IDI_AVI_ICON 0
-#define IDI_MPG_ICON 1
-#define IDI_MP4_ICON 2
-#define IDI_MKV_ICON 3
-#define IDI_OGM_ICON 4
-#define IDI_FLV_ICON 5
-#define IDI_WMV_ICON 6
-#define IDI_MOV_ICON 7
-#define IDI_RM_ICON 8
-#define IDI_MP3_ICON 9
-#define IDI_OGG_ICON 10
-#define IDI_AAC_ICON 11
-#define IDI_MKA_ICON 12
-#define IDI_WMA_ICON 13
-#define IDI_RA_ICON 14
-#define IDI_WAV_ICON 15
-#define IDI_MPA_ICON 16
-#define IDI_CDA_ICON 17
-#define IDI_MPC_ICON 18
-#define IDI_FLAC_ICON 19
-#define IDI_ALAC_ICON 20
-#define IDI_PLC_ICON 21
-#define IDI_D2V_ICON 22
-#define IDI_MID_ICON 23
-#define IDI_AIFF_ICON 24
-#define IDI_AU_ICON 25
-#define IDI_IVF_ICON 26
-#define IDI_FLIC_ICON 27
-#define IDI_BIK_ICON 28
-#define IDI_RATDVD_ICON 29
-#define IDI_ROQ_ICON 30
-#define IDI_RT_ICON 31
-#define IDI_DRC_ICON 32
-#define IDI_DSM_ICON 33
-#define IDI_SWF_ICON 34
-#define IDI_OTHER_ICON 35
-#define IDI_DVDA_ICON 36
-#define IDI_DVDF_ICON 37
+#define IDI_OTHER_ICON 0
+#define IDI_AAC_ICON 1
+#define IDI_AC3_ICON 2
+#define IDI_AIFF_ICON 3
+#define IDI_ALAC_ICON 4
+#define IDI_AMR_ICON 5
+#define IDI_APE_ICON 6
+#define IDI_AU_ICON 7
+#define IDI_AVI_ICON 8
+#define IDI_BINK_ICON 9
+#define IDI_CDA_ICON 10
+#define IDI_D2V_ICON 11
+#define IDI_DAT_ICON 12
+#define IDI_DRC_ICON 13
+#define IDI_DSM_ICON 14
+#define IDI_DTS_ICON 15
+#define IDI_FLAC_ICON 16
+#define IDI_FLIC_ICON 17
+#define IDI_FLV_ICON 18
+#define IDI_IFO_ICON 19
+#define IDI_IVF_ICON 20
+#define IDI_MIDI_ICON 21
+#define IDI_MKA_ICON 22
+#define IDI_MKV_ICON 23
+#define IDI_MOV_ICON 24
+#define IDI_MP3_ICON 25
+#define IDI_MP4_ICON 26
+#define IDI_MPA_ICON 27
+#define IDI_MPC_ICON 28
+#define IDI_MPEG_ICON 29
+#define IDI_OFR_ICON 30
+#define IDI_OGG_ICON 31
+#define IDI_OGM_ICON 32
+#define IDI_PLAYLIST_ICON 33
+#define IDI_RA_ICON 34
+#define IDI_RATDVD_ICON 35
+#define IDI_RM_ICON 36
+#define IDI_ROQ_ICON 37
+#define IDI_RT_ICON 38
+#define IDI_SMK_ICON 39
+#define IDI_SWF_ICON 40
+#define IDI_TS_ICON 41
+#define IDI_TTA_ICON 42
+#define IDI_VOB_ICON 43
+#define IDI_WAV_ICON 44
+#define IDI_WEBM_ICON 45
+#define IDI_WMA_ICON 46
+#define IDI_WMV_ICON 47
+#define IDI_WV_ICON 48
#define IDI_NONE -1
@@ -49,7 +60,7 @@ //
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 39
+#define _APS_NEXT_RESOURCE_VALUE 48
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.rc b/src/apps/mplayerc/mpciconlib/mpciconlib.rc index fdca4d0fd..bcd20d165 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.rc +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.rc @@ -55,44 +55,56 @@ END // The icons should have the exact same order as in "mpciconlib.h" !
+IDI_OTHER_ICON ICON "icons\\other.ico"
+IDI_AAC_ICON ICON "icons\\aac.ico"
+IDI_AC3_ICON ICON "icons\\ac3.ico"
+IDI_AIFF_ICON ICON "icons\\aiff.ico"
+IDI_ALAC_ICON ICON "icons\\alac.ico"
+IDI_AMR_ICON ICON "icons\\amr.ico"
+IDI_APE_ICON ICON "icons\\ape.ico"
+IDI_AU_ICON ICON "icons\\au.ico"
IDI_AVI_ICON ICON "icons\\avi.ico"
-IDI_MPG_ICON ICON "icons\\mpg.ico"
-IDI_MP4_ICON ICON "icons\\mp4.ico"
-IDI_MKV_ICON ICON "icons\\mkv.ico"
-IDI_OGM_ICON ICON "icons\\ogm.ico"
+IDI_BINK_ICON ICON "icons\\bink.ico"
+IDI_CDA_ICON ICON "icons\\cda.ico"
+IDI_D2V_ICON ICON "icons\\d2v.ico"
+IDI_DAT_ICON ICON "icons\\dat.ico"
+IDI_DRC_ICON ICON "icons\\drc.ico"
+IDI_DSM_ICON ICON "icons\\dsm.ico"
+IDI_DTS_ICON ICON "icons\\dts.ico"
+IDI_FLAC_ICON ICON "icons\\flac.ico"
+IDI_FLIC_ICON ICON "icons\\flic.ico"
IDI_FLV_ICON ICON "icons\\flv.ico"
-IDI_WMV_ICON ICON "icons\\wmv.ico"
+IDI_IFO_ICON ICON "icons\\ifo.ico"
+IDI_IVF_ICON ICON "icons\\ivf.ico"
+IDI_MIDI_ICON ICON "icons\\midi.ico"
+IDI_MKA_ICON ICON "icons\\mka.ico"
+IDI_MKV_ICON ICON "icons\\mkv.ico"
IDI_MOV_ICON ICON "icons\\mov.ico"
-IDI_RM_ICON ICON "icons\\rm.ico"
IDI_MP3_ICON ICON "icons\\mp3.ico"
-IDI_OGG_ICON ICON "icons\\ogg.ico"
-IDI_AAC_ICON ICON "icons\\aac.ico"
-IDI_MKA_ICON ICON "icons\\mka.ico"
-IDI_WMA_ICON ICON "icons\\wma.ico"
-IDI_RA_ICON ICON "icons\\ra.ico"
-IDI_WAV_ICON ICON "icons\\wav.ico"
+IDI_MP4_ICON ICON "icons\\mp4.ico"
IDI_MPA_ICON ICON "icons\\mpa.ico"
-IDI_CDA_ICON ICON "icons\\cda.ico"
IDI_MPC_ICON ICON "icons\\mpc.ico"
-IDI_FLAC_ICON ICON "icons\\flac.ico"
-IDI_ALAC_ICON ICON "icons\\alac.ico"
-IDI_PLC_ICON ICON "icons\\plc.ico"
-IDI_D2V_ICON ICON "icons\\d2v.ico"
-IDI_MID_ICON ICON "icons\\mid.ico"
-IDI_AIFF_ICON ICON "icons\\aiff.ico"
-IDI_AU_ICON ICON "icons\\au.ico"
-IDI_IVF_ICON ICON "icons\\ifv.ico"
-IDI_FLIC_ICON ICON "icons\\flic.ico"
-IDI_BIK_ICON ICON "icons\\bik.ico"
+IDI_MPEG_ICON ICON "icons\\mpeg.ico"
+IDI_OFR_ICON ICON "icons\\ofr.ico"
+IDI_OGG_ICON ICON "icons\\ogg.ico"
+IDI_OGM_ICON ICON "icons\\ogm.ico"
+IDI_PLAYLIST_ICON ICON "icons\\playlist.ico"
+IDI_RA_ICON ICON "icons\\ra.ico"
IDI_RATDVD_ICON ICON "icons\\ratdvd.ico"
+IDI_RM_ICON ICON "icons\\rm.ico"
IDI_ROQ_ICON ICON "icons\\roq.ico"
IDI_RT_ICON ICON "icons\\rt.ico"
-IDI_DRC_ICON ICON "icons\\drc.ico"
-IDI_DSM_ICON ICON "icons\\dsm.ico"
+IDI_SMK_ICON ICON "icons\\smk.ico"
IDI_SWF_ICON ICON "icons\\swf.ico"
-IDI_OTHER_ICON ICON "icons\\other.ico"
-IDI_DVDA_ICON ICON "icons\\dvda.ico"
-IDI_DVDF_ICON ICON "icons\\dvdf.ico"
+IDI_TS_ICON ICON "icons\\ts.ico"
+IDI_TTA_ICON ICON "icons\\tta.ico"
+IDI_VOB_ICON ICON "icons\\vob.ico"
+IDI_WAV_ICON ICON "icons\\wav.ico"
+IDI_WEBM_ICON ICON "icons\\webm.ico"
+IDI_WMA_ICON ICON "icons\\wma.ico"
+IDI_WMV_ICON ICON "icons\\wmv.ico"
+IDI_WV_ICON ICON "icons\\wv.ico"
+
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj index 5b89d0046..23e7cc8b0 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcproj @@ -199,6 +199,10 @@ >
</File>
<File
+ RelativePath=".\icons\ac3.ico"
+ >
+ </File>
+ <File
RelativePath=".\icons\aiff.ico"
>
</File>
@@ -207,6 +211,14 @@ >
</File>
<File
+ RelativePath=".\icons\amr.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\icons\ape.ico"
+ >
+ </File>
+ <File
RelativePath=".\icons\au.ico"
>
</File>
@@ -215,7 +227,7 @@ >
</File>
<File
- RelativePath=".\icons\bik.ico"
+ RelativePath=".\icons\bink.ico"
>
</File>
<File
@@ -227,19 +239,16 @@ >
</File>
<File
- RelativePath=".\icons\drc.ico"
+ RelativePath=".\icons\dat.ico"
>
</File>
- <File
+ RelativePath=".\icons\drc.ico"
+ > </File> <File
RelativePath=".\icons\dsm.ico"
>
</File>
<File
- RelativePath=".\icons\dvda.ico"
- >
- </File>
- <File
- RelativePath=".\icons\dvdf.ico"
+ RelativePath=".\icons\dts.ico"
>
</File>
<File
@@ -255,15 +264,15 @@ >
</File>
<File
- RelativePath=".\icons\ifv.ico"
+ RelativePath=".\icons\ifo.ico"
>
</File>
<File
- RelativePath=".\icons\jpeg.ico"
+ RelativePath=".\icons\ivf.ico"
>
</File>
<File
- RelativePath=".\icons\mid.ico"
+ RelativePath=".\icons\midi.ico"
>
</File>
<File
@@ -295,7 +304,11 @@ >
</File>
<File
- RelativePath=".\icons\mpg.ico"
+ RelativePath=".\icons\mpeg.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\icons\ofr.ico"
>
</File>
<File
@@ -311,7 +324,7 @@ >
</File>
<File
- RelativePath=".\icons\plc.ico"
+ RelativePath=".\icons\playlist.ico"
>
</File>
<File
@@ -319,7 +332,7 @@ >
</File>
<File
- RelativePath=".\icons\ratdvd.ico"
+ RelativePath=".\icons\rardvd.ico"
>
</File>
<File
@@ -335,14 +348,34 @@ >
</File>
<File
+ RelativePath=".\icons\smk.ico"
+ >
+ </File>
+ <File
RelativePath=".\icons\swf.ico"
>
</File>
<File
+ RelativePath=".\icons\ts.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\icons\tta.ico"
+ >
+ </File>
+ <File
+ RelativePath=".\icons\vob.ico"
+ >
+ </File>
+ <File
RelativePath=".\icons\wav.ico"
>
</File>
<File
+ RelativePath=".\icons\webm.ico"
+ >
+ </File>
+ <File
RelativePath=".\icons\wma.ico"
>
</File>
@@ -350,6 +383,10 @@ RelativePath=".\icons\wmv.ico"
>
</File>
+ <File
+ RelativePath=".\icons\wv.ico"
+ >
+ </File>
</Filter>
</Filter>
<File
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj index e7159d790..b70991633 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj @@ -71,6 +71,9 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\..\thirdparty\mfc\winmdi.cpp" />
<ClCompile Include="mpciconlib.cpp" />
</ItemGroup>
<ItemGroup>
@@ -82,23 +85,26 @@ </ItemGroup>
<ItemGroup>
<None Include="icons\aac.ico" />
+ <None Include="icons\ac3.ico" />
<None Include="icons\aiff.ico" />
<None Include="icons\alac.ico" />
+ <None Include="icons\amr.ico" />
+ <None Include="icons\ape.ico" />
<None Include="icons\au.ico" />
<None Include="icons\avi.ico" />
- <None Include="icons\bik.ico" />
+ <None Include="icons\bink.ico" />
<None Include="icons\cda.ico" />
<None Include="icons\d2v.ico" />
+ <None Include="icons\dat.ico" />
<None Include="icons\drc.ico" />
<None Include="icons\dsm.ico" />
- <None Include="icons\dvda.ico" />
- <None Include="icons\dvdf.ico" />
+ <None Include="icons\dts.ico" />
<None Include="icons\flac.ico" />
<None Include="icons\flic.ico" />
<None Include="icons\flv.ico" />
- <None Include="icons\ifv.ico" />
- <None Include="icons\jpeg.ico" />
- <None Include="icons\mid.ico" />
+ <None Include="icons\ifo.ico" />
+ <None Include="icons\ivf.ico" />
+ <None Include="icons\midi.ico" />
<None Include="icons\mka.ico" />
<None Include="icons\mkv.ico" />
<None Include="icons\mov.ico" />
@@ -106,20 +112,27 @@ <None Include="icons\mp4.ico" />
<None Include="icons\mpa.ico" />
<None Include="icons\mpc.ico" />
- <None Include="icons\mpg.ico" />
+ <None Include="icons\mpeg.ico" />
+ <None Include="icons\ofr.ico" />
<None Include="icons\ogg.ico" />
<None Include="icons\ogm.ico" />
<None Include="icons\other.ico" />
- <None Include="icons\plc.ico" />
+ <None Include="icons\playlist.ico" />
<None Include="icons\ra.ico" />
<None Include="icons\ratdvd.ico" />
<None Include="icons\rm.ico" />
<None Include="icons\roq.ico" />
<None Include="icons\rt.ico" />
+ <None Include="icons\smk.ico" />
<None Include="icons\swf.ico" />
+ <None Include="icons\ts.ico" />
+ <None Include="icons\tta.ico" />
+ <None Include="icons\vob.ico" />
<None Include="icons\wav.ico" />
+ <None Include="icons\webm.ico" />
<None Include="icons\wma.ico" />
<None Include="icons\wmv.ico" />
+ <None Include="icons\wv.ico" />
<None Include="mpciconlib.def" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters index fbef5b77d..192f81869 100644 --- a/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters +++ b/src/apps/mplayerc/mpciconlib/mpciconlib.vcxproj.filters @@ -18,6 +18,15 @@ </Filter>
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="mpciconlib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -42,19 +51,28 @@ <None Include="icons\aac.ico">
<Filter>Resource Files\icons</Filter>
</None>
+ <None Include="icons\ac3.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
<None Include="icons\aiff.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\alac.ico">
<Filter>Resource Files\icons</Filter>
</None>
+ <None Include="icons\amr.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
+ <None Include="icons\ape.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
<None Include="icons\au.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\avi.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\bik.ico">
+ <None Include="icons\bink.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\cda.ico">
@@ -63,16 +81,14 @@ <None Include="icons\d2v.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\drc.ico">
- <Filter>Resource Files\icons</Filter>
- </None>
- <None Include="icons\dsm.ico">
+ <None Include="icons\dat.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\dvda.ico">
+ <None Include="icons\drc.ico">
+ <Filter>Resource Files\icons</Filter> </None> <None Include="icons\dsm.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\dvdf.ico">
+ <None Include="icons\dts.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\flac.ico">
@@ -84,13 +100,13 @@ <None Include="icons\flv.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\ifv.ico">
+ <None Include="icons\ifo.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\jpeg.ico">
+ <None Include="icons\ivf.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\mid.ico">
+ <None Include="icons\midi.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\mka.ico">
@@ -114,7 +130,10 @@ <None Include="icons\mpc.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\mpg.ico">
+ <None Include="icons\mpeg.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
+ <None Include="icons\ofr.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\ogg.ico">
@@ -126,7 +145,7 @@ <None Include="icons\other.ico">
<Filter>Resource Files\icons</Filter>
</None>
- <None Include="icons\plc.ico">
+ <None Include="icons\playlist.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\ra.ico">
@@ -144,17 +163,35 @@ <None Include="icons\rt.ico">
<Filter>Resource Files\icons</Filter>
</None>
+ <None Include="icons\smk.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
<None Include="icons\swf.ico">
<Filter>Resource Files\icons</Filter>
</None>
+ <None Include="icons\ts.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
+ <None Include="icons\tta.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
+ <None Include="icons\vob.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
<None Include="icons\wav.ico">
<Filter>Resource Files\icons</Filter>
</None>
+ <None Include="icons\webm.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
<None Include="icons\wma.ico">
<Filter>Resource Files\icons</Filter>
</None>
<None Include="icons\wmv.ico">
<Filter>Resource Files\icons</Filter>
</None>
+ <None Include="icons\wv.ico">
+ <Filter>Resource Files\icons</Filter>
+ </None>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/src/apps/mplayerc/mpcresources/mplayerc.br.rc b/src/apps/mplayerc/mpcresources/mplayerc.br.rc Binary files differindex c267a194d..7a4b3ab05 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.br.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.br.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.by.rc b/src/apps/mplayerc/mpcresources/mplayerc.by.rc Binary files differindex 98a13edbc..a9b25e4ce 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.by.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.by.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ca.rc b/src/apps/mplayerc/mpcresources/mplayerc.ca.rc Binary files differindex c132d8d5a..ef4c8074f 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ca.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ca.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.cz.rc b/src/apps/mplayerc/mpcresources/mplayerc.cz.rc Binary files differindex b0dd405de..d61b0295d 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.cz.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.cz.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.de.rc b/src/apps/mplayerc/mpcresources/mplayerc.de.rc Binary files differindex a36061c54..e05f145c1 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.de.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.de.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.es.rc b/src/apps/mplayerc/mpcresources/mplayerc.es.rc Binary files differindex 04ba4c4bf..341d36af2 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.es.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.es.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.fr.rc b/src/apps/mplayerc/mpcresources/mplayerc.fr.rc Binary files differindex 7f48c176b..f43e0e09c 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.fr.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.fr.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.hu.rc b/src/apps/mplayerc/mpcresources/mplayerc.hu.rc Binary files differindex c91742cb0..526038f78 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.hu.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.hu.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.hy.rc b/src/apps/mplayerc/mpcresources/mplayerc.hy.rc Binary files differindex ee0aa334d..8e7a0f19d 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.hy.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.hy.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.it.rc b/src/apps/mplayerc/mpcresources/mplayerc.it.rc Binary files differindex 40e254ecf..65f748a62 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.it.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.it.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ja.rc b/src/apps/mplayerc/mpcresources/mplayerc.ja.rc Binary files differindex 897001b0d..a4ed401ec 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ja.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ja.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.kr.rc b/src/apps/mplayerc/mpcresources/mplayerc.kr.rc Binary files differindex 24cf854fc..a39578fcc 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.kr.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.kr.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.nl.rc b/src/apps/mplayerc/mpcresources/mplayerc.nl.rc Binary files differindex b6adfde8d..9e12b7baa 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.nl.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.nl.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.pl.rc b/src/apps/mplayerc/mpcresources/mplayerc.pl.rc Binary files differindex 308c87afe..6a98af0d4 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.pl.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.pl.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ru.rc b/src/apps/mplayerc/mpcresources/mplayerc.ru.rc Binary files differindex 9abce160d..a65233a9f 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ru.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ru.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sc.rc b/src/apps/mplayerc/mpcresources/mplayerc.sc.rc Binary files differindex 9ec96d91f..d5f6e4493 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.sc.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.sc.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sk.rc b/src/apps/mplayerc/mpcresources/mplayerc.sk.rc Binary files differindex bb587d76d..7d9c8feaf 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.sk.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.sk.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.sv.rc b/src/apps/mplayerc/mpcresources/mplayerc.sv.rc Binary files differindex 4063fbb38..aa658b1eb 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.sv.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.sv.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.tc.rc b/src/apps/mplayerc/mpcresources/mplayerc.tc.rc Binary files differindex 96625f639..921d738dc 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.tc.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.tc.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.tr.rc b/src/apps/mplayerc/mpcresources/mplayerc.tr.rc Binary files differindex fb140f3fa..0aba858b6 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.tr.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.tr.rc diff --git a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc Binary files differindex f9983d80b..9061204d7 100644 --- a/src/apps/mplayerc/mpcresources/mplayerc.ua.rc +++ b/src/apps/mplayerc/mpcresources/mplayerc.ua.rc diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt Binary files differindex 5cdf73e36..cb153e0a8 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.br.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt Binary files differindex 5c5062922..3dcf99837 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.by.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt Binary files differindex 87fd0bffc..c0da4049f 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ca.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt Binary files differindex 973a86c02..9e55a9a92 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.cz.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt Binary files differindex 8cad041ef..35914ef23 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.de.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt Binary files differindex 439d0762d..50b2d03fe 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.es.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt Binary files differindex ab08337e7..b189365f9 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.fr.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt Binary files differindex a5e81892a..3f2dbf707 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.hu.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt Binary files differindex f939640d2..04a31bba4 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.hy.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt Binary files differindex 5e3cbfae7..61bdeb3c2 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.it.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt Binary files differindex a7f2a213e..a1f5132e0 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ja.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt Binary files differindex e9f7a7db1..a2f099d9a 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.kr.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt Binary files differindex ca52a3af4..0bed51e81 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.nl.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt Binary files differindex 53130e684..f93f81f16 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.pl.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt Binary files differindex 3c0986343..2ea2829be 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt Binary files differindex ec291d929..53d216435 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ru.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt Binary files differindex 765da9666..1b597dad8 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.sc.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt Binary files differindex 6ad202493..a52285630 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.sk.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt Binary files differindex f0055ee05..dc925682b 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.sv.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt Binary files differindex 994e7b95b..c63bd7bf2 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.tc.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt Binary files differindex e7a2d77d2..e2e309c9b 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.tr.rc.txt diff --git a/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt b/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt Binary files differindex 99415ed72..9e5c1e0d0 100644 --- a/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt +++ b/src/apps/mplayerc/mpcresources/text/mplayerc.ua.rc.txt diff --git a/src/apps/mplayerc/mplayerc.rc b/src/apps/mplayerc/mplayerc.rc Binary files differindex f91c91f53..fdc6ab051 100644 --- a/src/apps/mplayerc/mplayerc.rc +++ b/src/apps/mplayerc/mplayerc.rc diff --git a/src/apps/mplayerc/mplayerc.vcxproj b/src/apps/mplayerc/mplayerc.vcxproj index 0ab9f89da..4b81edff2 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj +++ b/src/apps/mplayerc/mplayerc.vcxproj @@ -198,6 +198,9 @@ update_version.bat </Manifest>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp" />
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp" />
<ClCompile Include="AppSettings.cpp" />
<ClCompile Include="AuthDlg.cpp" />
<ClCompile Include="BaseGraph.cpp" />
@@ -583,9 +586,6 @@ update_version.bat </ItemGroup>
<ItemGroup>
<ResourceCompile Include="mplayerc.rc">
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
diff --git a/src/apps/mplayerc/mplayerc.vcxproj.filters b/src/apps/mplayerc/mplayerc.vcxproj.filters index b6321432b..692a8a7f0 100644 --- a/src/apps/mplayerc/mplayerc.vcxproj.filters +++ b/src/apps/mplayerc/mplayerc.vcxproj.filters @@ -342,6 +342,15 @@ <ClCompile Include="AppSettings.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxctrlcontainer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\afxglobals.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\thirdparty\mfc\winmdi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="AuthDlg.h">
diff --git a/src/apps/mplayerc/resource.h b/src/apps/mplayerc/resource.h Binary files differindex 345265dd8..18d910625 100644 --- a/src/apps/mplayerc/resource.h +++ b/src/apps/mplayerc/resource.h diff --git a/src/apps/mplayerc/stdafx.h b/src/apps/mplayerc/stdafx.h index c580fc393..fc64a27bc 100644 --- a/src/apps/mplayerc/stdafx.h +++ b/src/apps/mplayerc/stdafx.h @@ -21,41 +21,23 @@ *
*/
-#if !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_)
-#define AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_
-
#pragma once
-#include "../../DSUtil/SharedInclude.h"
-
-#define HITTEST_RET LRESULT
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#include "../../../DSUtil/SharedInclude.h"
+#include "../../../../include/stdafx_common.h"
+#undef _ATL_CSTRING_EXPLICIT_CONSTRUCTORS
+#include "../../../../include/stdafx_common_afx2.h"
+#include "../../../../include/stdafx_common_dshow.h"
-#include <afxwin.h> // MFC core and standard components
-#include <afxext.h> // MFC extensions
-#include <afxdisp.h> // MFC Automation classes
-#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls
-#ifndef _AFX_NO_AFXCMN_SUPPORT
-#include <afxcmn.h> // MFC support for Windows Common Controls
-#endif // _AFX_NO_AFXCMN_SUPPORT
#include <afxdlgs.h>
-#define ResStr(id) CString(MAKEINTRESOURCE(id))
-
-#include <afxdisp.h>
-#include <afxole.h>
#include <Shlwapi.h>
#include <atlcoll.h>
#include <atlpath.h>
-#include "../../thirdparty/zlib/zlib.h"
-#include <streams.h>
-#include <dvdmedia.h>
-#include <mpconfig.h>
-#ifndef _WIN64
-#include <qt/qt.h>
-#endif
+#define HITTEST_RET LRESULT
+#include "../../thirdparty/zlib/zlib.h"
#include "../../CmdUI/CmdUI.h"
#include "../../thirdparty/ui/ResizableLib/ResizableDialog.h"
#include "../../thirdparty/ui/ResizableLib/ResizablePage.h"
@@ -66,15 +48,17 @@ #include "../../thirdparty/ui/TreePropSheet/TreePropSheet.h"
#include "../../DSUtil/DSUtil.h"
+#ifndef _WIN64
+#include <qt/qt.h>
+#endif
+
#include <gdiplus.h>
+#include <mpconfig.h>
+
+#define ResStr(id) CString(MAKEINTRESOURCE(id))
template <class T = CString, class S = CString>
class CAtlStringMap : public CAtlMap<S, T, CStringElementTraits<S> > {};
#define CheckAndLog(x, msg) hr = ##x; if (FAILED (hr)) { TRACE(msg" : 0x%08x\n", hr); return hr; }
#define CheckNoLog(x) hr = ##x; if (FAILED (hr)) { return hr; }
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__C76533D6_6242_4BEB_8FD3_C6BE58F07224__INCLUDED_)
|