[Pmplib-commits] SF.net SVN: pmplib: [42] trunk/frontend/easypmp/win32gui

[<ny...@us...>]

Revision: 42
Author:   nyaochi
Date:     2006-06-03 21:16:24 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=42&view=rev

Log Message:
-----------
Fixed broken EasyPMP [Win32 GUI] since rev 16.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/pmplib/?rev=16&view=rev

Modified Paths:
--------------
    trunk/frontend/easypmp/win32gui/preference.h
    trunk/frontend/easypmp/win32gui/processingdlg.h
Modified: trunk/frontend/easypmp/win32gui/preference.h
===================================================================
--- trunk/frontend/easypmp/win32gui/preference.h	2006-06-04 04:04:35 UTC (rev 41)
+++ trunk/frontend/easypmp/win32gui/preference.h	2006-06-04 04:16:24 UTC (rev 42)
@@ -192,7 +192,7 @@
 		USES_CONVERSION;
 
 		if (pmp) {
-			strPlayerLocation = W2CT(pmp->env.path_to_root);
+			strPlayerLocation = W2CT(pmp->env.path_to_root.path);
 			strPlayerIdentifier = A2CT(pmp->env.id);
 			strPlayerDescription = A2CT(pmp->env.name);
 			strPlayerDescription += _T("");

Modified: trunk/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/frontend/easypmp/win32gui/processingdlg.h	2006-06-04 04:04:35 UTC (rev 41)
+++ trunk/frontend/easypmp/win32gui/processingdlg.h	2006-06-04 04:16:24 UTC (rev 42)
@@ -390,12 +390,12 @@
 		/* Eject the device. */
 		m_preference.bSafelyRemove = IsDlgButtonChecked(IDC_CHECK_SAFEREMOVE) == BST_CHECKED ? TRUE : FALSE;
 		if (m_preference.bSafelyRemove) {
-			if (ucs2len(pmp->env.path_to_root) > 2 && pmp->env.path_to_root[1] == ':') {
+			if (ucs2len(pmp->env.path_to_root.path) > 2 && pmp->env.path_to_root.path[1] == ':') {
 				int i;
 				const int max_tries = 20;
 				CHAR szDrive[3] = {0, 0, 0};
-				szDrive[0] = (CHAR)pmp->env.path_to_root[0];
-				szDrive[1] = (CHAR)pmp->env.path_to_root[1];
+				szDrive[0] = (CHAR)pmp->env.path_to_root.path[0];
+				szDrive[1] = (CHAR)pmp->env.path_to_root.path[1];
 				szDrive[2] = 0;
 
 				ejectdevice_t* ed = ejectdevice_init();
@@ -666,9 +666,9 @@
 		write_log(LL_TRACE, _T("Firmware mode: %s"), A2CT(pmp->env.mode));
 		write_log(LL_INFO, _T("Firmware version: %s"), A2CT(pmp->env.version));
 		write_log(LL_TRACE, _T("Default language: %s"), A2CT(pmp->env.language));
-		write_log(LL_TRACE, _T("Root directory: %s"), W2CT(pmp->env.path_to_root));
-		write_log(LL_TRACE, _T("Music directory: %s"), W2CT(pmp->env.path_to_music));
-		write_log(LL_TRACE, _T("Playlist directory: %s"), W2CT(pmp->env.path_to_playlist));
+		write_log(LL_TRACE, _T("Root directory: %s"), W2CT(pmp->env.path_to_root.path));
+		write_log(LL_TRACE, _T("Music directory: %s"), W2CT(pmp->env.path_to_music.path));
+		write_log(LL_TRACE, _T("Playlist directory: %s"), W2CT(pmp->env.path_to_playlist.path));
 		write_log(LL_TRACE, _T("Playlist extension: %s"), W2CT(pmp->env.playlist_ext));
 		write_log(LL_INFO, _T(""));
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.