Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [311] trunk/pmplib
|
From: <ny...@us...> - 2007-02-08 17:31:21
|
Revision: 311
http://svn.sourceforge.net/pmplib/?rev=311&view=rev
Author: nyaochi
Date: 2007-02-08 09:31:14 -0800 (Thu, 08 Feb 2007)
Log Message:
-----------
Sync the Win32 GUI with the latest API.
Modified Paths:
--------------
trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc
trunk/pmplib/frontend/easypmp/win32gui/maindlg.h
trunk/pmplib/frontend/easypmp/win32gui/preference.h
trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
trunk/pmplib/pmp.sln
Modified: trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc 2007-02-08 16:41:30 UTC (rev 310)
+++ trunk/pmplib/frontend/easypmp/win32gui/easypmp_win32gui.rc 2007-02-08 17:31:14 UTC (rev 311)
@@ -29,6 +29,20 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_DONE ICON "res\\checkmark.ico"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+END
+
+#endif // APSTUDIO_INVOKED
+
#endif // \x93\xFA\x96{\x8C\xEA resources
/////////////////////////////////////////////////////////////////////////////
@@ -78,54 +92,51 @@
// Dialog
//
-IDD_PREFERENCE DIALOGEX 0, 0, 263, 246
+IDD_PREFERENCE DIALOGEX 0, 0, 263, 234
STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU
CAPTION "EasyPMP [Win32 GUI]"
FONT 8, "MS Shell Dlg", 400, 0, 0x80
BEGIN
- DEFPUSHBUTTON "OK",IDOK,144,222,48,12
- PUSHBUTTON "Cancel",IDCANCEL,204,222,48,12
+ DEFPUSHBUTTON "OK",IDOK,144,210,48,12
+ PUSHBUTTON "Cancel",IDCANCEL,204,210,48,12
GROUPBOX "Media database",IDC_STATIC,12,12,240,48
CONTROL "&None",IDC_RADIO_DATABASE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,24,72,8
CONTROL "&Update",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,96,24,72,8
CONTROL "&Rebuild",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,168,24,72,8
LTEXT "Source of media information (&z):",IDC_STATIC,24,42,108,12
COMBOBOX IDC_COMBO_MEDIAINFO_SOURCE,138,42,102,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- GROUPBOX "Playlist conversion",IDC_STATIC,12,66,240,72
+ GROUPBOX "Playlist conversion",IDC_STATIC,12,66,240,60
CONTROL "N&one",IDC_RADIO_PLAYLIST,"Button",BS_AUTORADIOBUTTON | WS_GROUP,24,78,72,8
CONTROL "&Update",IDC_RADIO5,"Button",BS_AUTORADIOBUTTON,96,78,72,8
CONTROL "Re&convert",IDC_RADIO6,"Button",BS_AUTORADIOBUTTON,168,78,72,8
- LTEXT "Playlist folder(s):",IDC_STATIC,24,96,72,8
- CONTROL "&Music",IDC_CHECK_PL_MUSIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,96,72,8
- CONTROL "&Playlist",IDC_CHECK_PL_PLAYLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,96,72,8
- LTEXT "Conversion option:",IDC_STATIC,24,108,72,8
- CONTROL "&Find missing",IDC_CHECK_PL_FIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,108,72,8
- CONTROL "&Skip missing",IDC_CHECK_PL_SKIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,108,72,8
- CONTROL "Use &JavaScript playlist",IDC_CHECK_PL_JSPL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,120,144,8
- GROUPBOX "Portable Player Device",IDC_STATIC,12,144,240,72
- LTEXT "&Location:",IDC_STATIC,24,156,42,12,SS_CENTERIMAGE
- COMBOBOX IDC_COMBO_DEVICE_LOCATION,78,156,42,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Sa&ve log",IDC_CHECK_SAVE_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,156,66,12
- LTEXT "&Identifier:",IDC_STATIC,24,174,42,12,SS_CENTERIMAGE
- COMBOBOX IDC_COMBO_DEVICE_ID,78,174,162,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- LTEXT "Description:",IDC_STATIC,24,192,42,12,SS_CENTERIMAGE
- LTEXT "?X?^?e?B?b?N",IDC_STATIC_PLAYER_DESCRIPTION,78,192,162,12,0,WS_EX_CLIENTEDGE
+ LTEXT "Conversion option:",IDC_STATIC,24,96,72,8
+ CONTROL "&Find missing",IDC_CHECK_PL_FIND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,96,72,8
+ CONTROL "&Skip missing",IDC_CHECK_PL_SKIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,96,72,8
+ CONTROL "Use &JavaScript playlist",IDC_CHECK_PL_JSPL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,108,144,8
+ GROUPBOX "Portable Player Device",IDC_STATIC,12,132,240,72
+ LTEXT "&Location:",IDC_STATIC,24,145,42,12,SS_CENTERIMAGE
+ COMBOBOX IDC_COMBO_DEVICE_LOCATION,78,145,42,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Sa&ve log",IDC_CHECK_SAVE_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,145,66,12
+ LTEXT "&Identifier:",IDC_STATIC,24,162,42,12,SS_CENTERIMAGE
+ COMBOBOX IDC_COMBO_DEVICE_ID,78,162,162,36,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Description:",IDC_STATIC,24,180,42,12,SS_CENTERIMAGE
+ LTEXT "?X?^?e?B?b?N",IDC_STATIC_PLAYER_DESCRIPTION,78,180,162,12,0,WS_EX_CLIENTEDGE
CONTROL "E&ject the player on completion",IDC_CHECK_SAFEREMOVE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,222,120,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,210,120,12
END
-IDD_PROCESSING DIALOGEX 0, 0, 263, 246
+IDD_PROCESSING DIALOGEX 0, 0, 263, 234
STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU
CAPTION "EasyPMP [Win32 GUI]"
FONT 8, "MS Shell Dlg", 400, 0, 0x80
BEGIN
- DEFPUSHBUTTON "OK",IDOK,144,222,48,12,NOT WS_VISIBLE
- PUSHBUTTON "Cancel",IDCANCEL,204,222,48,12
+ DEFPUSHBUTTON "OK",IDOK,144,210,48,12,NOT WS_VISIBLE
+ PUSHBUTTON "Cancel",IDCANCEL,204,210,48,12
CONTROL "",IDC_LIST_PROGRESS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER,12,12,240,84
- EDITTEXT IDC_EDIT_LOG,12,96,240,120,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ EDITTEXT IDC_EDIT_LOG,12,96,240,102,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
CONTROL "E&ject the player on completion",IDC_CHECK_SAFEREMOVE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,222,120,12
- CONTROL "Don't &close",IDC_CHECK_DONT_CLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,222,48,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,210,120,12
+ CONTROL "Don't &close",IDC_CHECK_DONT_CLOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,144,210,48,12
END
@@ -142,7 +153,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 256
TOPMARGIN, 7
- BOTTOMMARGIN, 239
+ BOTTOMMARGIN, 227
END
IDD_PROCESSING, DIALOG
@@ -150,7 +161,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 256
TOPMARGIN, 7
- BOTTOMMARGIN, 239
+ BOTTOMMARGIN, 227
END
END
#endif // APSTUDIO_INVOKED
@@ -316,8 +327,8 @@
//
// Generated from the TEXTINCLUDE 3 resource.
//
-//CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "res\\easypmp_win32gui.exe.manifest"
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Modified: trunk/pmplib/frontend/easypmp/win32gui/maindlg.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/maindlg.h 2007-02-08 16:41:30 UTC (rev 310)
+++ trunk/pmplib/frontend/easypmp/win32gui/maindlg.h 2007-02-08 17:31:14 UTC (rev 311)
@@ -70,8 +70,6 @@
BEGIN_DDX_MAP(CMainDlg)
DDX_RADIO(IDC_RADIO_DATABASE, m_setting.iDBProces)
DDX_RADIO(IDC_RADIO_PLAYLIST, m_setting.iPlaylistProcess)
- DDX_CHECK(IDC_CHECK_PL_PLAYLIST, m_setting.bConvertInPlaylist)
- DDX_CHECK(IDC_CHECK_PL_MUSIC, m_setting.bConvertInMusic)
DDX_CHECK(IDC_CHECK_PL_FIND, m_setting.bSearchMissing)
DDX_CHECK(IDC_CHECK_PL_SKIP, m_setting.bSkipMissing)
DDX_CHECK(IDC_CHECK_PL_JSPL, m_setting.bJSPL)
Modified: trunk/pmplib/frontend/easypmp/win32gui/preference.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/preference.h 2007-02-08 16:41:30 UTC (rev 310)
+++ trunk/pmplib/frontend/easypmp/win32gui/preference.h 2007-02-08 17:31:14 UTC (rev 311)
@@ -34,8 +34,6 @@
int iMediaInfoSource;
CString strStripWords;
int iPlaylistProcess;
- BOOL bConvertInPlaylist;
- BOOL bConvertInMusic;
BOOL bSearchMissing;
BOOL bSkipMissing;
BOOL bJSPL;
@@ -53,8 +51,6 @@
iMediaInfoSource = 0;
strStripWords = _T("the");
iPlaylistProcess = 2;
- bConvertInPlaylist = TRUE;
- bConvertInMusic = TRUE;
bSearchMissing = TRUE;
bSkipMissing = FALSE;
bJSPL = FALSE;
@@ -105,8 +101,6 @@
persistInt(iMediaInfoSource, _T("Database"), _T("MediaInfoSource"), szSettingFile, storing);
persistString(strStripWords, _T("Database"), _T("StripWords"), szSettingFile, storing);
persistInt(iPlaylistProcess, _T("Playlist"), _T("Process"), szSettingFile, storing);
- persistBool(bConvertInPlaylist, _T("Playlist"), _T("ConvertPlaylist"), szSettingFile, storing);
- persistBool(bConvertInMusic, _T("Playlist"), _T("ConvertMusic"), szSettingFile, storing);
persistBool(bSearchMissing, _T("Playlist"), _T("SearchMissing"), szSettingFile, storing);
persistBool(bSkipMissing, _T("Playlist"), _T("SkipMissing"), szSettingFile, storing);
persistBool(bJSPL, _T("Playlist"), _T("JSPL"), szSettingFile, storing);
@@ -199,17 +193,18 @@
USES_CONVERSION;
if (pmp) {
- strPlayerLocation = UCS2CT(pmp->env.path_to_root.path);
- strPlayerIdentifier = A2CT(pmp->decl.id);
- strPlayerDescription = A2CT(pmp->decl.name);
- strPlayerDescription += _T("");
- if (*pmp->decl.version) {
+ strPlayerLocation = UCS2CT(pmp->info.path_to_root);
+ strPlayerIdentifier = A2CT(pmp->info.decl.id);
+ strPlayerDescription = A2CT(pmp->info.decl.manufacturer);
+ strPlayerDescription += _T(" ");
+ strPlayerDescription += A2CT(pmp->info.decl.name);
+ if (*pmp->info.decl.version) {
strPlayerDescription += _T(" ");
- strPlayerDescription += A2CT(pmp->decl.version);
+ strPlayerDescription += A2CT(pmp->info.decl.version);
}
- if (*pmp->decl.mode) {
+ if (*pmp->info.decl.mode) {
strPlayerDescription += _T(" ");
- strPlayerDescription += A2CT(pmp->decl.mode);
+ strPlayerDescription += A2CT(pmp->info.decl.mode);
}
} else {
strPlayerIdentifier = _T("");
Modified: trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h
===================================================================
--- trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2007-02-08 16:41:30 UTC (rev 310)
+++ trunk/pmplib/frontend/easypmp/win32gui/processingdlg.h 2007-02-08 17:31:14 UTC (rev 311)
@@ -47,13 +47,13 @@
}
enum {
- PHASE_ENUMERATE_MUSIC = 0,
+ PHASE_OPEN_DEVICE = 0,
+ PHASE_ENUMERATE_MUSIC,
PHASE_ENUMERATE_PLAYLIST,
- PHASE_DATABASE_READ,
- PHASE_DATABASE_OBTAIN,
- PHASE_DATABASE_UPDATE,
- PHASE_DATABASE_WRITE,
+ PHASE_MUSIC_OBTAIN,
+ PHASE_MUSIC_UPDATE,
PHASE_PLAYLIST_CONVERT,
+ PHASE_CLOSE_DEVICE,
};
enum {
@@ -278,8 +278,6 @@
case 1: opt.verb |= MODE_PLAYLIST; break;
case 2: opt.verb |= (MODE_PLAYLIST | MODE_PLAYLIST_RECONVERT); break;
}
- if (m_preference.bConvertInMusic) opt.verb |= MODE_PLAYLIST_MUSIC;
- if (m_preference.bConvertInPlaylist) opt.verb |= MODE_PLAYLIST_PLAYLIST;
if (m_preference.bSearchMissing) opt.verb |= MODE_PLAYLIST_FIND;
if (m_preference.bSkipMissing) opt.verb |= MODE_PLAYLIST_SKIP;
if (m_preference.bJSPL) opt.verb |= MODE_PLAYLIST_JSPL;
@@ -306,13 +304,13 @@
m_ctrlListProgress.InsertColumn(0, _T("Task"), LVCFMT_LEFT, -1, -1);
// Insert tasks.
+ m_ctrlListProgress.InsertItem(PHASE_OPEN_DEVICE, _T("Opening the device"), IDI_QUEUING);
m_ctrlListProgress.InsertItem(PHASE_ENUMERATE_MUSIC, _T("Enumerating music files"), IDI_QUEUING);
m_ctrlListProgress.InsertItem(PHASE_ENUMERATE_PLAYLIST, _T("Enumerating playlist files"), IDI_QUEUING);
- m_ctrlListProgress.InsertItem(PHASE_DATABASE_READ, _T("Reading the database"), IDI_QUEUING);
- m_ctrlListProgress.InsertItem(PHASE_DATABASE_OBTAIN, _T("Obtaining media information"), IDI_QUEUING);
- m_ctrlListProgress.InsertItem(PHASE_DATABASE_UPDATE, _T("Updating the database"), IDI_QUEUING);
- m_ctrlListProgress.InsertItem(PHASE_DATABASE_WRITE, _T("Writing the database"), IDI_QUEUING);
+ m_ctrlListProgress.InsertItem(PHASE_MUSIC_OBTAIN, _T("Obtaining media information"), IDI_QUEUING);
+ m_ctrlListProgress.InsertItem(PHASE_MUSIC_UPDATE, _T("Updating the music database"), IDI_QUEUING);
m_ctrlListProgress.InsertItem(PHASE_PLAYLIST_CONVERT, _T("Converting playlists"), IDI_QUEUING);
+ m_ctrlListProgress.InsertItem(PHASE_CLOSE_DEVICE, _T("Closing the device"), IDI_QUEUING);
// Expand the size of the task column.
m_ctrlListProgress.SetColumnWidth(0, LVSCW_AUTOSIZE);
@@ -331,12 +329,35 @@
return 1;
}
+ // Generate open flag.
+ int openflag = 0;
+ if (opt.verb & MODE_DATABASE) {
+ openflag |= PMPOF_MUSIC_DB_WRITE;
+ if (opt.verb & MODE_DATABASE_UPDATE) {
+ openflag |= PMPOF_MUSIC_DB_READ;
+ }
+ }
+ if (opt.verb & MODE_DATABASE_REPR) {
+ openflag |= PMPOF_MUSIC_DB_READ;
+ }
+ if (opt.verb & MODE_PLAYLIST) {
+ openflag |= PMPOF_MUSIC_PL_WRITE;
+ }
+
// Show copyright information.
showCopyrightInformation();
// Show player information.
showPlayerInformation(pmp);
+ //
+ this->setState(PHASE_OPEN_DEVICE, STATE_PROCESSING);
+ result = pmp->open(pmp, openflag);
+ if (result != 0) {
+ goto error_exit;
+ }
+ this->setState(PHASE_OPEN_DEVICE, STATE_DONE);
+
// Enumerate target files.
easypmp_filelist_t musics, playlists;
@@ -374,20 +395,17 @@
write_log(LL_TRACE, _T(""));
}
- // Execute jobs.
- if (opt.verb & MODE_DATABASE) {
- result = easypmp_database(&musics, pmp, &opt, &records, &num_records, easypmp_progress, this);
+ // Update database entries for database mode and JSPL playlists.
+ if ((opt.verb & MODE_DATABASE) || (opt.verb & MODE_PLAYLIST_JSPL)) {
+ result = easypmp_database(pmp, &musics, &opt, &records, &num_records, easypmp_progress, this);
if (result != 0) {
goto error_exit;
}
}
+
+ // Convert playlists.
if (opt.verb & MODE_PLAYLIST) {
- if ((opt.verb & MODE_PLAYLIST_JSPL) && (!records)) {
- setState(PHASE_DATABASE_READ, STATE_PROCESSING);
- easypmp_database_read(pmp, &opt, &records, &num_records, easypmp_progress, this);
- setState(PHASE_DATABASE_READ, STATE_DONE);
- }
- result = easypmp_playlist(&playlists, &musics, pmp, &opt, records, num_records, easypmp_progress, this);
+ result = easypmp_playlist(pmp, &playlists, &musics, &opt, records, num_records, easypmp_progress, this);
if (result != 0) {
goto error_exit;
}
@@ -399,12 +417,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.path) > 2 && pmp->env.path_to_root.path[1] == ':') {
+ if (ucs2len(pmp->info.path_to_root) > 2 && pmp->info.path_to_root[1] == ':') {
int i;
const int max_tries = 20;
CHAR szDrive[3] = {0, 0, 0};
- szDrive[0] = (CHAR)pmp->env.path_to_root.path[0];
- szDrive[1] = (CHAR)pmp->env.path_to_root.path[1];
+ szDrive[0] = (CHAR)pmp->info.path_to_root[0];
+ szDrive[1] = (CHAR)pmp->info.path_to_root[1];
szDrive[2] = 0;
ejectdevice_t* ed = ejectdevice_init();
@@ -434,27 +452,28 @@
}
}
- if (records) {
- /* Free the record array. */
- int i;
- for (i = 0;i < num_records;++i) {
- pmplib_record_finish(&records[i]);
- }
- free(records);
+ // Close the device.
+ this->setState(PHASE_CLOSE_DEVICE, STATE_PROCESSING);
+ result = pmp->close(pmp);
+ if (result != 0) {
+ goto error_exit;
}
+ this->setState(PHASE_CLOSE_DEVICE, STATE_DONE);
+
+ // Free the music records.
+ if (records && num_records) {
+ pmplib_records_finish(records, num_records);
+ }
+
easypmp_free_filelist(&playlists);
easypmp_free_filelist(&musics);
pmp->release(pmp);
return 0;
error_exit:
- if (records) {
- /* Free the record array. */
- int i;
- for (i = 0;i < num_records;++i) {
- pmplib_record_finish(&records[i]);
- }
- free(records);
+ // Free the music records.
+ if (records && num_records) {
+ pmplib_records_finish(records, num_records);
}
easypmp_free_filelist(&playlists);
easypmp_free_filelist(&musics);
@@ -515,9 +534,7 @@
CProcessingDlg* dlg = (CProcessingDlg*)instance;
switch (phase) {
- case EASYPMPDBP_START:
- break;
- case EASYPMPDBP_READ|EASYPMPSP_START:
+/* case EASYPMPDBP_READ|EASYPMPSP_START:
dlg->setState(PHASE_DATABASE_READ, STATE_PROCESSING);
dlg->write_log(LL_TRACE, _T("[Reading database]"));
break;
@@ -536,39 +553,39 @@
dlg->setState(PHASE_DATABASE_READ, STATE_DONE);
dlg->write_log(LL_TRACE, str);
dlg->write_log(LL_TRACE, _T(""));
- break;
- case EASYPMPDBP_GMI|EASYPMPSP_START:
- dlg->setState(PHASE_DATABASE_OBTAIN, STATE_PROCESSING);
- dlg->m_ctrlListProgress.GetSubItemRect(PHASE_DATABASE_OBTAIN, 1, LVIR_BOUNDS, &rt);
+ break;*/
+ case EASYPMPP_MUSIC_GMI|EASYPMPSP_START:
+ dlg->setState(PHASE_MUSIC_OBTAIN, STATE_PROCESSING);
+ dlg->m_ctrlListProgress.GetSubItemRect(PHASE_MUSIC_OBTAIN, 1, LVIR_BOUNDS, &rt);
dlg->m_ctrlProgress.SetWindowPos(HWND_TOP, rt, SWP_SHOWWINDOW);
//dlg->m_ctrlProgress.Create(dlg->m_ctrlListProgress, rt, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
dlg->m_ctrlProgress.SetRange(0, param_int);
dlg->write_log(LL_TRACE, _T("[Obtaining media information]"));
break;
- case EASYPMPDBP_GMI|EASYPMPSP_PROGRESS:
+ case EASYPMPP_MUSIC_GMI|EASYPMPSP_PROGRESS:
str.Format(_T("(%d) %s"), param_int+1, UCS2CT(filepath_skippath(param_str)));
dlg->m_ctrlProgress.SetText(str);
dlg->m_ctrlProgress.SetPos(param_int);
dlg->write_log(LL_TRACE, _T("%s"), UCS2CT(param_str));
break;
- case EASYPMPDBP_GMI|EASYPMPSP_END:
+ case EASYPMPP_MUSIC_GMI|EASYPMPSP_END:
dlg->m_ctrlProgress.ShowWindow(SW_HIDE);
//dlg->m_ctrlProgress.DestroyWindow();
str.Format(_T("%d files were imported"), param_int);
- dlg->setProgress(PHASE_DATABASE_OBTAIN, str);
- dlg->setState(PHASE_DATABASE_OBTAIN, STATE_DONE);
+ dlg->setProgress(PHASE_MUSIC_OBTAIN, str);
+ dlg->setState(PHASE_MUSIC_OBTAIN, STATE_DONE);
dlg->write_log(LL_TRACE, _T(""));
break;
- case EASYPMPDBP_UPDATE|EASYPMPSP_START:
- dlg->setState(PHASE_DATABASE_UPDATE, STATE_PROCESSING);
+ case EASYPMPP_MUSIC_UPDATE|EASYPMPSP_START:
+ dlg->setState(PHASE_MUSIC_UPDATE, STATE_PROCESSING);
dlg->write_log(LL_TRACE, _T("[Updating database]"));
break;
- case EASYPMPDBP_UPDATE|EASYPMPSP_END:
- dlg->setState(PHASE_DATABASE_UPDATE, STATE_DONE);
- dlg->setProgress(PHASE_DATABASE_UPDATE, _T("Done"));
+ case EASYPMPP_MUSIC_UPDATE|EASYPMPSP_END:
+ dlg->setState(PHASE_MUSIC_UPDATE, STATE_DONE);
+ dlg->setProgress(PHASE_MUSIC_UPDATE, _T("Done"));
dlg->write_log(LL_TRACE, _T(""));
break;
- case EASYPMPDBP_WRITE|EASYPMPSP_START:
+/* case EASYPMPDBP_WRITE|EASYPMPSP_START:
dlg->setState(PHASE_DATABASE_WRITE, STATE_PROCESSING);
dlg->write_log(LL_TRACE, _T("[Writing database]"));
break;
@@ -578,13 +595,9 @@
dlg->setState(PHASE_DATABASE_WRITE, STATE_DONE);
dlg->setProgress(PHASE_DATABASE_WRITE, _T("Done"));
dlg->write_log(LL_TRACE, _T(""));
- break;
- case EASYPMPDBP_END:
- break;
+ break;*/
- case EASYPMPPLP_START:
- break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_START:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_START:
dlg->setState(PHASE_PLAYLIST_CONVERT, STATE_PROCESSING);
dlg->m_ctrlListProgress.GetSubItemRect(PHASE_PLAYLIST_CONVERT, 1, LVIR_BOUNDS, &rt);
dlg->m_ctrlProgress.SetWindowPos(HWND_TOP, rt, SWP_SHOWWINDOW);
@@ -592,30 +605,30 @@
dlg->m_ctrlProgress.SetRange(0, param_int);
dlg->write_log(LL_TRACE, _T("[Playlist conversion]"));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_PROGRESS:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_PROGRESS:
str.Format(_T("(%d) %s"), param_int+1, UCS2CT(filepath_skippath(param_str)));
dlg->m_ctrlProgress.SetText(str);
dlg->m_ctrlProgress.SetPos(param_int);
dlg->write_log(LL_TRACE, _T("%s"), UCS2CT(param_str));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_WARN_PLAYLIST:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_WARN_PLAYLIST:
dlg->m_bFailed = TRUE;
dlg->write_log(LL_WARNING, _T("WARNING: %s"), UCS2CT(param_str));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_SKIP_PLAYLIST:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_SKIP_PLAYLIST:
dlg->m_bFailed = TRUE;
dlg->write_log(LL_ERROR, _T("ERROR: %s"), UCS2CT(param_str));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_MISSING_MEDIA:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_MISSING_MEDIA:
dlg->write_log(LL_INFO, _T(" %s"), UCS2CT(param_str));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_JSPL_ERROR:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_JSPL_ERROR:
dlg->write_log(LL_ERROR, _T("JSPL(ERROR): %s"), UCS2CT(param_str));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_JSPL_OUTPUT:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_JSPL_OUTPUT:
dlg->write_log(LL_INFO, _T("JSPL: %s"), UCS2CT(param_str));
break;
- case EASYPMPPLP_CONVERT|EASYPMPSP_END:
+ case EASYPMPP_PLAYLIST_CONVERT|EASYPMPSP_END:
dlg->m_ctrlProgress.ShowWindow(SW_HIDE);
//dlg->m_ctrlProgress.DestroyWindow();
str.Format(_T("%d playlists were succeeded"), param_int);
@@ -623,8 +636,6 @@
dlg->setState(PHASE_PLAYLIST_CONVERT, STATE_DONE);
dlg->write_log(LL_TRACE, _T(""));
break;
- case EASYPMPPLP_END:
- break;
}
return (dlg->m_bCancel) ? -1 : 0;
@@ -670,15 +681,15 @@
USES_CONVERSION;
write_log(LL_INFO, _T("[Player information]"));
- write_log(LL_INFO, _T("Device identifier: %s"), A2CT(pmp->decl.id));
- write_log(LL_INFO, _T("Product name: %s"), A2CT(pmp->decl.name));
- write_log(LL_TRACE, _T("Firmware mode: %s"), A2CT(pmp->decl.mode));
- write_log(LL_INFO, _T("Firmware version: %s"), A2CT(pmp->decl.version));
- write_log(LL_TRACE, _T("Default language: %s"), A2CT(pmp->decl.language));
- write_log(LL_TRACE, _T("Root directory: %s"), UCS2CT(pmp->env.path_to_root.path));
- write_log(LL_TRACE, _T("Music directory: %s"), UCS2CT(pmp->env.path_to_music.path));
- write_log(LL_TRACE, _T("Playlist directory: %s"), UCS2CT(pmp->env.path_to_playlist.path));
- write_log(LL_TRACE, _T("Playlist extension: %s"), UCS2CT(pmp->env.playlist_ext));
+ write_log(LL_INFO, _T("Device identifier: %s"), A2CT(pmp->info.decl.id));
+ write_log(LL_INFO, _T("Product manufacturer: %s"), A2CT(pmp->info.decl.manufacturer));
+ write_log(LL_INFO, _T("Product name: %s"), A2CT(pmp->info.decl.name));
+ write_log(LL_INFO, _T("Firmware mode: %s"), A2CT(pmp->info.decl.mode));
+ write_log(LL_INFO, _T("Firmware version: %s"), A2CT(pmp->info.decl.version));
+ write_log(LL_INFO, _T("Default language: %s"), A2CT(pmp->info.decl.language));
+ write_log(LL_INFO, _T("Root directory: %s"), UCS2CT(pmp->info.path_to_root));
+ write_log(LL_INFO, _T("Music directory: %s"), UCS2CT(pmp->info.path_to_music));
+ write_log(LL_INFO, _T("Playlist directory: %s"), UCS2CT(pmp->info.path_to_playlist));
write_log(LL_INFO, _T(""));
}
Modified: trunk/pmplib/pmp.sln
===================================================================
--- trunk/pmplib/pmp.sln 2007-02-08 16:41:30 UTC (rev 310)
+++ trunk/pmplib/pmp.sln 2007-02-08 17:31:14 UTC (rev 311)
@@ -42,11 +42,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "easypmp_win32gui", "frontend\easypmp\win32gui\easypmp_win32gui.vcproj", "{45CCFC7B-42B4-4FF9-AF43-FC3626B1672F}"
ProjectSection(ProjectDependencies) = postProject
+ {E393575C-6B10-43BD-B2C0-63C5040A49F7} = {E393575C-6B10-43BD-B2C0-63C5040A49F7}
+ {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1} = {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1}
+ {544769C2-6989-452F-B626-E442CAC6553B} = {544769C2-6989-452F-B626-E442CAC6553B}
+ {C74FE9C9-B5C4-438A-B157-9BCB6C8A7546} = {C74FE9C9-B5C4-438A-B157-9BCB6C8A7546}
{8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A} = {8BFE7DD6-F825-42BA-A7D7-EFCDCC9D686A}
{3575EFC2-9051-467A-BEB4-E71E2F8664D7} = {3575EFC2-9051-467A-BEB4-E71E2F8664D7}
{3419FA86-F518-4D3B-94C6-B05436439102} = {3419FA86-F518-4D3B-94C6-B05436439102}
- {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1} = {2548F270-FFCF-43B4-BB9D-D5AAD5B5FEF1}
- {E393575C-6B10-43BD-B2C0-63C5040A49F7} = {E393575C-6B10-43BD-B2C0-63C5040A49F7}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmp_portalplayer1", "lib\pmp_portalplayer1\pmp_portalplayer1.vcproj", "{544769C2-6989-452F-B626-E442CAC6553B}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
