+ Fixed open file dialog not being modal

 + Fixed add directory dialog not being modal
 + Enabled XP visual style support
 + Fixed bitrate display showing parts of previous songs bitrate
 + WAV file bitrate is now shown

Author: wisepenguin

development/official/coolplayer/CPI_Player_Callbacks.c

@@ -42,13 +42,32 @@ void CPI_Player_cb_OnStreamInfo(CP_HPLAYER hPlayer, const CPs_FileInfo* pInfo)
 {
 	globals.main_long_track_duration = pInfo->m_iFileLength_Secs;
 
+	ZeroMemory(globals.main_text_bitrate, BITRATE_STRLEN);
+	ZeroMemory(globals.main_text_frequency, FREQ_STRLEN);
+
+	{
+		int i;
+		for (i = 0; i < 4; i++)
+		{
+			globals.main_text_bitrate[i] = ' ';
+			globals.main_text_frequency[i] = ' ';
+		}
+	}
+
 	// For those people who do like to know the bitrate (!!)
-	
-	if (pInfo->m_iBitRate_Kbs)
+	if (pInfo->m_iBitRate_Kbs >= 1000)
 		_itoa(pInfo->m_iBitRate_Kbs, globals.main_text_bitrate, 10);
+	else if (pInfo->m_iBitRate_Kbs < 1000 && pInfo->m_iBitRate_Kbs > 100)
+		_itoa(pInfo->m_iBitRate_Kbs, globals.main_text_bitrate+1, 10);
+	else if (pInfo->m_iBitRate_Kbs < 100 && pInfo->m_iBitRate_Kbs > 10)
+		_itoa(pInfo->m_iBitRate_Kbs, globals.main_text_bitrate+2, 10);
+	else if (pInfo->m_iBitRate_Kbs < 10)
+		_itoa(pInfo->m_iBitRate_Kbs, globals.main_text_bitrate+3, 10);
 	else
 		globals.main_text_bitrate[0] = '\0';
 
+
+
 	if (pInfo->m_iFreq_Hz)
 		_itoa(pInfo->m_iFreq_Hz / 1000, globals.main_text_frequency, 10);
 	else

development/official/coolplayer/CPI_Player_CoDec_WAV.c

@@ -208,7 +208,11 @@ BOOL CPP_OMWAV_OpenFile(CPs_CoDecModule* pModule, const char* pcFilename, DWORD
 		}
 
 		// Setup file info struct - this is re-read every second
-		pContext->m_FileInfo.m_iBitRate_Kbs = 0;  // Suppress bitrate display
+		// if m_iBitRate_Kbs = 0, bitrate display is suppressed
+		pContext->m_FileInfo.m_iBitRate_Kbs = 
+				(pFormat->wBitsPerSample * pFormat->wf.nChannels * pFormat->wf.nSamplesPerSec) / 1000;
+		
+
 		pContext->m_FileInfo.m_iFreq_Hz = pFormat->wf.nSamplesPerSec;
 		pContext->m_FileInfo.m_bStereo = pFormat->wf.nChannels == 2 ? TRUE : FALSE;
 		pContext->m_FileInfo.m_b16bit = pFormat->wBitsPerSample == 16 ? TRUE : FALSE;

development/official/coolplayer/CPI_Playlist.c

@@ -1067,7 +1067,7 @@ void CPL_AddPrefixedFile(CP_HPLAYLIST hPlaylist,
 //
 //
 //
-/** TODO - make AddFile load playlists from URLs **/
+/** // TODO: - make AddFile load playlists from URLs **/
 // currently only supports loading m3u from URL
 // and has code duplication for reading m3u file
 void CPL_AddFile(CP_HPLAYLIST hPlaylist, const char* pcFilename)

development/official/coolplayer/CPI_PlaylistItem.c

@@ -1242,7 +1242,7 @@ void CPLI_CalculateLength_OGG(CPs_PlaylistItem* pItem)
 //
 //
 //
-/** TODO - reformat and check - move all this to separate function **/
+/** // TODO: - reformat and check - move all this to separate function **/
 // at the moment CPI_Player_CoDec_WAV has this same code
 void CPLI_CalculateLength_WAV(CPs_PlaylistItem* pItem)
 {

development/official/coolplayer/CPI_Verbs.c

@@ -54,6 +54,7 @@ wp_Verb glb_pfnAllVerbs[] =
 	CPVERB_VolumeDown,
 
 	CPVERB_OpenFile,
+	CPVERB_AddFile,
 	CPVERB_About,
 	CPVERB_Exit,
 
@@ -65,8 +66,6 @@ wp_Verb glb_pfnAllVerbs[] =
 	CPVERB_PlaylistMinimise,
 	CPVERB_PlaylistMaximise,
 
-	/** TODO - move next to OpenFile ? **/
-	CPVERB_AddFile,
 	NULL
 };
 //
@@ -496,7 +495,9 @@ void CPVERB_About(const CPe_VerbAction enAction, void* _pParam)
 void CPVERB_Exit(const CPe_VerbAction enAction, void* _pParam)
 {
 	if (enAction == vaDoVerb)
-		DestroyWindow(windows.wnd_main);
+	{
+		DestroyWindow(_pParam);
+	}
 	else if (enAction == vaQueryName)
 	{
 		CPs_VerbQueryName* pParam = (CPs_VerbQueryName*)_pParam;
@@ -585,7 +586,7 @@ void CPVERB_AddDirectory(const CPe_VerbAction enAction, void* _pParam)
 		int image = 0;
 		char directorychoice[MAX_PATH];
 
-		browseinfo.hwndOwner = (HWND)_pParam;
+		browseinfo.hwndOwner = (HWND)windows.wnd_main;
 		browseinfo.pidlRoot = NULL;
 		browseinfo.pszDisplayName = directorychoice;
 		browseinfo.lpszTitle = "Choose a directory to add";

development/official/coolplayer/coolplayer.dsp

@@ -292,6 +292,7 @@ END
 //
 
 IDR_DEFAULTSKIN         SKIN    DISCARDABLE     "res\\Default.CPSkin"
+1	24	DISCARDABLE	"res\\coolplayer.exe.manifest"
 #endif    // English (U.K.) resources
 /////////////////////////////////////////////////////////////////////////////
 

development/official/coolplayer/coolplayer.rc

@@ -387,12 +387,15 @@ struct
 	CPe_QuickFindTerm m_enQuickFindTerm;
 } options;
 
+#define BITRATE_STRLEN	40
+#define FREQ_STRLEN	40
+
 struct
 {
 	BOOL    playlist_bool_addsong;
 	DWORD playlist_last_add_time;
-	char    main_text_frequency[33];
-	char    main_text_bitrate[33];
+	char    main_text_frequency[FREQ_STRLEN];
+	char    main_text_bitrate[BITRATE_STRLEN];
 	unsigned long main_long_track_duration;
 	int     main_int_skin_last_number;
 	CPe_PlayerState m_enPlayerState;

development/official/coolplayer/globals.h

@@ -504,7 +504,7 @@ int     playlist_open_file(BOOL clearlist)
 	BOOL    returnval;
 	char    initialfilename[MAX_PATH * 200] = "";
 	fn.lStructSize = sizeof(OPENFILENAME);
-	fn.hwndOwner = (HWND) GetWindowLong(windows.wnd_main, DWL_USER);
+	fn.hwndOwner = (HWND)windows.wnd_main;
 	fn.hInstance = NULL;
 	fn.lpstrFilter = filefilter;
 	fn.lpstrCustomFilter = NULL;
@@ -1008,8 +1008,7 @@ void    options_create(HWND hWnd)
 
 void    url_create(HWND hWnd)
 {
-	DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_URL),
-			  hWnd, (DLGPROC) url_windowproc);  
+	DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_URL), hWnd, (DLGPROC) url_windowproc);  
 }
 
 void    main_menuproc(HWND hWnd, LPPOINT points)
@@ -1035,7 +1034,8 @@ void    main_menuproc(HWND hWnd, LPPOINT points)
 	{
 
 		case MENU_EXIT:
-			DestroyWindow(hWnd);
+			CPVERB_Exit(vaDoVerb, hWnd);
+			// DestroyWindow(hWnd);
 			break;
 
 		case MENU_PLAYLIST:
@@ -1435,8 +1435,8 @@ main_windowproc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 							break;
 
 						case ExitButton:
-							DestroyWindow(hWnd);
-							
+							CPVERB_Exit(vaDoVerb, hWnd);
+							// DestroyWindow(hWnd);
 							break;
 
 						case EjectButton:

development/official/coolplayer/main.c

@@ -181,10 +181,7 @@ options_windowproc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			return TRUE;
 		}
 
-		case WM_CLOSE:
-			EndDialog(hwndDlg, 1);
-			return TRUE;
-			
+
 		case WM_COMMAND:
 
 			switch (LOWORD(wParam))
@@ -257,7 +254,7 @@ options_windowproc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				case IDCANCEL:
 					EndDialog(hwndDlg, 1);
 					break;
-					
+
 				case IDOK:
 				{
 					BOOL    duplicatesalreadyremoved =

development/official/coolplayer/options.c

@@ -2,6 +2,11 @@ CoolPlayer Revision History
 ===========================
 Version 219
  + Fixed potential buffer overflow when reading OGG tags
+ + Fixed open file dialog not being modal
+ + Fixed add directory dialog not being modal
+ + Enabled XP visual style support
+ + Fixed bitrate display showing parts of previous songs bitrate
+ + WAV file bitrate is now shown
 
 Version 218
  + Fixed channels being swapped when toggling EQ

development/official/coolplayer/res/changes.txt

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
+<assemblyIdentity 
+    version="1.0.0.0" 
+    processorArchitecture="X86" 
+    name="CoolPlayer"   type="win32" 
+/> 
+<description>Small, fast music player for MP3, OGG, and WAV files</description> 
+<dependency> 
+    <dependentAssembly> 
+        <assemblyIdentity 
+            type="win32" 
+            name="Microsoft.Windows.Common-Controls" 
+            version="6.0.0.0" 
+            processorArchitecture="X86" 
+            publicKeyToken="6595b64144ccf1df" 
+            language="*" 
+        /> 
+    </dependentAssembly> 
+</dependency> 
+</assembly>

development/official/coolplayer/res/coolplayer.exe.manifest

@@ -91,7 +91,8 @@ int main_set_default_skin(void)
 							   "");
 	main_skin_set_struct_value(TimeText, 59, 35, 13, 14, 0, 0, 0, 0, 0,
 							   "");
-	main_skin_set_struct_value(BitrateText, 89, 48, 0, 0, 0, 0, 0, 0, 0,
+
+	main_skin_set_struct_value(BitrateText, 83, 48, 0, 0, 0, 0, 0, 0, 0,
 							   "");
 	main_skin_set_struct_value(FreqText, 125, 48, 0, 0, 0, 0, 0, 0, 0, "");