- [GSPlayeR] backport maplay, libmad changes

- [GSPlayeR] add File Info option
roytam1 · Jul 15, 2008 · ce90765 · ce90765
1 parent 0693211
commit ce90765
Show file tree

Hide file tree

Showing 67 changed files with 12,125 additions and 315 deletions.
diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2.vcb b/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2.vcb
diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2.vco b/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2.vco
diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2e.rc b/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2e.rc
@@ -210,6 +210,8 @@ BEGIN
     BEGIN
         MENUITEM "Play",                        IDM_PLAY_SELECTED
         MENUITEM SEPARATOR
+        MENUITEM "Info",                        IDM_FILE_INFO
+        MENUITEM SEPARATOR
         MENUITEM "Up",                          IDM_FILE_UP
         MENUITEM "Down",                        IDM_FILE_DOWN
         MENUITEM "Delete",                      IDM_FILE_DELETE

diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2e.vcl b/GSPlayeR/GSPlayer2/WinCE_PPC2/GSPlayer2e.vcl
@@ -6,13 +6,13 @@
 --------------------Configuration: GSPlayer2e - Win32 (WCE ARMV4) ReleaseXScale--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10A.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP103.tmp" with contents
 [
 /nologo /W3 /Oxt /Ob2 /I "./" /I "../" /I "../../include" /D _WIN32_WCE=420 /D "WIN32_PLATFORM_PSPC=400" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=420 /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_WIN32_WCE_PPC" /FR"ARMV4ReleaseXScale/" /Fp"ARMV4ReleaseXScale/GSPlayer2e.pch" /YX /Fo"ARMV4ReleaseXScale/" /MC /QRxscale /QRxscalesched /c 
-"F:\jatf\gsp225src\GSPlayer2\MainWndCtrl.cpp"
+"F:\jatf\RTOSS\GSPlayeR\GSPlayer2\WinCE_PPC2\PpcMainWnd.cpp"
 ]
-Creating command line "clarm.exe @C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10A.tmp" 
-Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10B.tmp" with contents
+Creating command line "clarm.exe @C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP103.tmp" 
+Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP104.tmp" with contents
 [
 commctrl.lib coredll.lib aygshell.lib winsock.lib ../../lib/ARMV4Relx/libmad.lib ../../lib/ARMV4Relx/libovd.lib ../../lib/ARMV4Relx/maplay.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /incremental:no /pdb:"ARMV4ReleaseXScale/GSPlayer2.pdb" /nodefaultlib:"libc.lib /nodefaultlib:libcd.lib /nodefaultlib:libcmt.lib /nodefaultlib:libcmtd.lib /nodefaultlib:msvcrt.lib /nodefaultlib:msvcrtd.lib" /out:"../../bin/eng/WinCE_PPC2/ARMV4Relx/GSPlayer2.exe" /subsystem:windowsce,4.20 /align:"4096" /MACHINE:ARM 
 .\ARMV4ReleaseXScale\EffectDlgPPC.obj
@@ -34,16 +34,16 @@ commctrl.lib coredll.lib aygshell.lib winsock.lib ../../lib/ARMV4Relx/libmad.lib
 .\ARMV4ReleaseXScale\PpcPlayerApp.obj
 .\ARMV4ReleaseXScale\PpcSkin.obj
 .\ARMV4ReleaseXScale\Skin.obj
+.\ARMV4ReleaseXScale\sloperand.obj
 .\ARMV4ReleaseXScale\SmallSlider.obj
 .\ARMV4ReleaseXScale\GSPlayer2e.res
-.\ARMV4ReleaseXScale\sloperand.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10B.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP104.tmp"
 <h3>Output Window</h3>
 Compiling...
-MainWndCtrl.cpp
+PpcMainWnd.cpp
 Linking...
-Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10E.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP107.tmp" with contents
 [
 /nologo /o"ARMV4ReleaseXScale/GSPlayer2e.bsc" 
 .\ARMV4ReleaseXScale\EffectDlgPPC.sbr
@@ -65,9 +65,9 @@ Creating temporary file "C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10E.tmp" with contents
 .\ARMV4ReleaseXScale\PpcPlayerApp.sbr
 .\ARMV4ReleaseXScale\PpcSkin.sbr
 .\ARMV4ReleaseXScale\Skin.sbr
-.\ARMV4ReleaseXScale\SmallSlider.sbr
-.\ARMV4ReleaseXScale\sloperand.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP10E.tmp"
+.\ARMV4ReleaseXScale\sloperand.sbr
+.\ARMV4ReleaseXScale\SmallSlider.sbr]
+Creating command line "bscmake.exe @C:\DOCUME~1\Roy\LOCALS~1\Temp\RSP107.tmp"
 Creating browse info file...
 <h3>Output Window</h3>
 

diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/PpcMainWnd.cpp b/GSPlayeR/GSPlayer2/WinCE_PPC2/PpcMainWnd.cpp
@@ -301,6 +301,9 @@ LRESULT CPpcMainWnd::OnCommand(WPARAM wParam, LPARAM lParam)
 		ToggleDisplay();
 		OnTimer(ID_TIMER_DISPSTATE);
 		return 0;
+	case IDM_FILE_INFO:
+		OnFileInfo();
+		return 0;
 	case IDM_FILE_UP:
 		OnFileUp();
 		return 0;
@@ -1085,6 +1088,24 @@ void CPpcMainWnd::OnFileDown()
 	}
 }
 
+void CPpcMainWnd::OnFileInfo()
+{
+	TCHAR szMsg[MAX_PATH*10];
+
+	if (!ListView_GetSelectedCount(m_hwndLV))
+		return;
+
+	int nCount = ListView_GetItemCount(m_hwndLV);
+	for (int i = 0; i < nCount; i++) {
+		if (ListView_GetItemState(m_hwndLV, i, LVIS_SELECTED)) {
+			FILEINFO* pInfo = (FILEINFO*)m_pListFile->GetAt(i);
+			wsprintf(szMsg,_T("File: %s\nTrack name: %s\nArtist: %s\nAlbum: %s\nComment: %s\nGenre: %s\nYear: %d\nTrack Number: %d"),pInfo->szPath,pInfo->tag.szTrack,pInfo->tag.szArtist,pInfo->tag.szAlbum,pInfo->tag.szComment,pInfo->tag.szGenre,pInfo->tag.nYear,pInfo->tag.nTrackNum);
+			MessageBox(m_hWnd, szMsg, _T("File Info"), MB_ICONINFORMATION);
+		}
+	}
+
+}
+
 void CPpcMainWnd::OnFileDelete()
 {
 	int i;

diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/PpcMainWnd.h b/GSPlayeR/GSPlayer2/WinCE_PPC2/PpcMainWnd.h
@@ -75,6 +75,7 @@ class CPpcMainWnd : public CMainWnd
 	virtual void OnEnqueue();
 	virtual void OnDequeue();
 	virtual void OnClearQueue();
+	virtual void OnFileInfo();
 
 	virtual void OnFileUp();
 	virtual void OnFileDown();

diff --git a/GSPlayeR/GSPlayer2/WinCE_PPC2/resource.h b/GSPlayeR/GSPlayer2/WinCE_PPC2/resource.h
@@ -326,13 +326,14 @@
 #define IDM_PLAY_STOPAFTERCURR          40096
 #define IDM_DEQUEUE                     40097
 #define IDM_CLEARQUEUE                  40098
+#define IDM_FILE_INFO					40099
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        150
-#define _APS_NEXT_COMMAND_VALUE         40099
+#define _APS_NEXT_COMMAND_VALUE         40100
 #define _APS_NEXT_CONTROL_VALUE         1054
 #define _APS_NEXT_SYMED_VALUE           102
 #endif

diff --git a/GSPlayeR/bin/eng/WinCE_PPC2/ARMV4Relx/GSPlayer2.exe b/GSPlayeR/bin/eng/WinCE_PPC2/ARMV4Relx/GSPlayer2.exe
diff --git a/GSPlayeR/include/libovd.h b/GSPlayeR/include/libovd.h
@@ -51,7 +51,7 @@ typedef struct {
 
 
 typedef struct {
-	char* buf;
+	unsigned char* buf;
 	unsigned long len;
 	HANDLE handle;
 } ovd_stream_buf;

diff --git a/GSPlayeR/include/maplay.h b/GSPlayeR/include/maplay.h
@@ -101,6 +101,8 @@ typedef struct tID3Tag
 #define MAXLONGLONG                      (0x7fffffffffffffff)
 #endif
 
+#define MAX_WAVEOUTVOLUME	0xFFFFFFFF
+
 #define MAP_MSG_BASE		(WM_USER + 10000)
 #define MAP_MSG_STATUS		(MAP_MSG_BASE + 1) // wParam == MAP_STATUS, lParam = error (stop only)
 #define MAP_MSG_PEEK		(MAP_MSG_BASE + 2) // wParam == l lParam == r
@@ -172,6 +174,10 @@ MAPLIBEXPORT(int) MAP_GetStreamingBufferingCount(HANDLE hLib);
 MAPLIBEXPORT(int) MAP_GetDecoderPlugInCount(HANDLE hLib);
 MAPLIBEXPORT(MAP_DEC_PLUGIN*) MAP_GetDecoderPlugIn(HANDLE hLib, int nIndex);
 
+// volume
+MAPLIBEXPORT(DWORD) MAP_GetVolume(HANDLE hLib, BOOL bSysVolume);
+MAPLIBEXPORT(void) MAP_SetVolume(HANDLE hLib, DWORD dwVolume, BOOL bSysVolume);
+
 #ifdef __cplusplus
 };
 #endif