• R/O
  • SSH
  • HTTPS

foo-mixi: Commit


Commit MetaInfo

Révision61 (tree)
l'heure2009-01-11 04:23:08
Auteuryoshy

Message de Log

2009/01/11 yoshy - バージョン情報にSDKコンポーネントクライアントバージョンを表示するよう修正

Change Summary

Modification

--- src/foo_mixi_feat_winamp/trunk/foo_mixi_feat_winamp_for_fb2k_0_8_3/foo_mixi_feat_winamp.cpp (revision 60)
+++ src/foo_mixi_feat_winamp/trunk/foo_mixi_feat_winamp_for_fb2k_0_8_3/foo_mixi_feat_winamp.cpp (revision 61)
@@ -36,6 +36,7 @@
3636 typedef UIntMap::const_iterator UIntMapCIt;
3737
3838 #include "../SDK/foobar2000.h"
39+#include "../SDK/component.h"
3940 #include "../helpers/helpers.h"
4041
4142 #if 0
@@ -89,7 +90,7 @@
8990 #define DUMMYAMP_HOOK_MODE _T("既存 Winamp API Emulator をフック中")
9091 #define DUMMYAMP_STANDALONE_MODE _T("単独で Winamp API をエミュレート中")
9192 #define DEBUG_SETTINGS_CAPTION "デバッグ用の設定"
92-#define PLUGIN_VERSION "0.2.0.1"
93+#define PLUGIN_VERSION "0.2.0.2"
9394
9495 #define DEFAULT_DUMMYAMP_TITLE_FORMAT "[%artist% - ]$if(%title%,%title%,%_filename%)"
9596
@@ -185,6 +186,7 @@
185186
186187 tstring GetErrorMessage(DWORD errCode);
187188 void putLogError(LPCTSTR pMethod, LPCTSTR pErrMsg, DWORD dwErrCode);
189+void setDlgVersionInfo(HWND wnd, UINT idc_version, UINT idc_build);
188190 void DebugPrint(int severity, LPCTSTR lpszFormat, ...);
189191 void DebugPrintDBCS(int severity, LPCSTR lpszFormat, ...);
190192 void DebugPrint8(int severity, LPCSTR lpszFormat, ...);
@@ -247,7 +249,7 @@
247249 static string_utf8_from_os g_pluginCaption8(_T(PLUGIN_CAPTION_JP));
248250 static string_utf8_from_os g_pluginVersion8(_T(PLUGIN_VERSION));
249251 static string_utf8_from_os g_pluginAbout8(
250- _T(PLUGIN_CAPTION_JP) _T(" ") _T(PLUGIN_VERSION) _T("\nCopyright (C) 2006-2008 Yossiepon Oniichan, All Rights Reserved."));
252+ _T(PLUGIN_CAPTION_JP) _T(" ") _T(PLUGIN_VERSION) _T("\nCopyright (C) 2006-2009 Yossiepon Oniichan, All Rights Reserved."));
251253
252254 DECLARE_COMPONENT_VERSION(g_pluginCaption8, g_pluginVersion8, g_pluginAbout8);
253255
@@ -3511,8 +3513,7 @@
35113513 double pos3 = pfc_string_to_float(cfg_send_interval3);
35123514 uSendMessage(hSendInterval3, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos3);
35133515
3514- uSetDlgItemText(wnd, IDC_VERSION, PLUGIN_CAPTION " " PLUGIN_VERSION);
3515- uSetDlgItemText(wnd, IDC_BUILD, "build on " __DATE__ ", " __TIME__);
3516+ setDlgVersionInfo(wnd, IDC_VERSION, IDC_BUILD);
35163517 }
35173518 break;
35183519
@@ -3797,8 +3798,7 @@
37973798 uEnableWindow(hControlWnd, false);
37983799 }
37993800
3800- uSetDlgItemText(wnd, IDC_VERSION_ADVANCED, PLUGIN_CAPTION " " PLUGIN_VERSION);
3801- uSetDlgItemText(wnd, IDC_BUILD_ADVANCED, "build on " __DATE__ ", " __TIME__);
3801+ setDlgVersionInfo(wnd, IDC_VERSION_ADVANCED, IDC_BUILD_ADVANCED);
38023802 }
38033803 break;
38043804
@@ -4029,8 +4029,7 @@
40294029 uSendDlgItemMessage(wnd, IDC_DEBUG_PLUGIN, CB_SETCURSEL, (int)cfg_debug_plugin, 0);
40304030 uSendDlgItemMessage(wnd, IDC_DEBUG_CALLBACK, CB_SETCURSEL, (int)cfg_debug_callback, 0);
40314031
4032- uSetDlgItemText(wnd, IDC_VERSION_DEBUG, PLUGIN_CAPTION " " PLUGIN_VERSION);
4033- uSetDlgItemText(wnd, IDC_BUILD_DEBUG, "build on " __DATE__ ", " __TIME__);
4032+ setDlgVersionInfo(wnd, IDC_VERSION_DEBUG, IDC_BUILD_DEBUG);
40344033 }
40354034 break;
40364035
@@ -4209,6 +4208,17 @@
42094208 LOG_ERROR(_T("%s - コード: %08x, 理由: %s"), pMethod, dwErrCode, errMsg.c_str());
42104209 }
42114210
4211+void setDlgVersionInfo(HWND wnd, UINT idc_version, UINT idc_build) {
4212+
4213+ StrDBCS64K version;
4214+
4215+ sprintf_s(version, sizeof(StrDBCS64K), PLUGIN_CAPTION " " PLUGIN_VERSION " with SDK%d (compatible%d)",
4216+ foobar2000_client::FOOBAR2000_CLIENT_VERSION, foobar2000_client::FOOBAR2000_CLIENT_VERSION_COMPATIBLE);
4217+
4218+ uSetDlgItemText(wnd, idc_version, version);
4219+ uSetDlgItemText(wnd, idc_build, "build on " __DATE__ ", " __TIME__);
4220+}
4221+
42124222 void DebugPrint(int severity, LPCTSTR lpszFormat, ...)
42134223 {
42144224 static Str64K buf;
--- src/foo_mixi_feat_winamp/trunk/foo_mixi_feat_winamp_for_fb2k_0_8_3/resource.h (revision 60)
+++ src/foo_mixi_feat_winamp/trunk/foo_mixi_feat_winamp_for_fb2k_0_8_3/resource.h (revision 61)
@@ -40,6 +40,11 @@
4040 #define IDC_DISABLE_ANSI_TRANS 1032
4141 #define IDC_ENABLE_EXT_IPC_PROC 1033
4242 #define IDC_DUMMYAMP_FRAME 1034
43+#define IDC_ENABLE_STREAMING_FILE 1035
44+#define IDC_NO_ARTIST_NAME 1036
45+#define IDC_NO_TITLE_NAME 1037
46+#define IDC_NO_ALBUM_NAME 1038
47+#define IDC_NO_GENRE_NAME 1039
4348
4449 // Next default values for new objects
4550 //
@@ -47,7 +52,7 @@
4752 #ifndef APSTUDIO_READONLY_SYMBOLS
4853 #define _APS_NEXT_RESOURCE_VALUE 104
4954 #define _APS_NEXT_COMMAND_VALUE 40001
50-#define _APS_NEXT_CONTROL_VALUE 1035
55+#define _APS_NEXT_CONTROL_VALUE 1040
5156 #define _APS_NEXT_SYMED_VALUE 101
5257 #endif
5358 #endif
--- src/foo_mixi_feat_winamp/trunk/foo_mixi_feat_winamp_for_fb2k_0_9_X/foo_mixi_feat_winamp.cpp (revision 60)
+++ src/foo_mixi_feat_winamp/trunk/foo_mixi_feat_winamp_for_fb2k_0_9_X/foo_mixi_feat_winamp.cpp (revision 61)
@@ -36,6 +36,7 @@
3636 typedef UIntMap::const_iterator UIntMapCIt;
3737
3838 #include "../SDK/foobar2000.h"
39+#include "../SDK/component.h"
3940 #include "../helpers/helpers.h"
4041
4142 #if 0
@@ -89,7 +90,7 @@
8990 #define DUMMYAMP_HOOK_MODE _T("既存 Winamp API Emulator をフック中")
9091 #define DUMMYAMP_STANDALONE_MODE _T("単独で Winamp API をエミュレート中")
9192 #define DEBUG_SETTINGS_CAPTION "デバッグ用の設定"
92-#define PLUGIN_VERSION "0.2.0.1"
93+#define PLUGIN_VERSION "0.2.0.2"
9394
9495 #define DEFAULT_DUMMYAMP_TITLE_FORMAT "[%artist% - ]$if(%title%,%title%,%_filename%)"
9596
@@ -185,6 +186,7 @@
185186
186187 tstring GetErrorMessage(DWORD errCode);
187188 void putLogError(LPCTSTR pMethod, LPCTSTR pErrMsg, DWORD dwErrCode);
189+void setDlgVersionInfo(HWND wnd, UINT idc_version, UINT idc_build);
188190 void DebugPrint(int severity, LPCTSTR lpszFormat, ...);
189191 void DebugPrintDBCS(int severity, LPCSTR lpszFormat, ...);
190192 void DebugPrint8(int severity, LPCSTR lpszFormat, ...);
@@ -247,7 +249,7 @@
247249 static string_utf8_from_os g_pluginCaption8(_T(PLUGIN_CAPTION_JP));
248250 static string_utf8_from_os g_pluginVersion8(_T(PLUGIN_VERSION));
249251 static string_utf8_from_os g_pluginAbout8(
250- _T(PLUGIN_CAPTION_JP) _T(" ") _T(PLUGIN_VERSION) _T("\nCopyright (C) 2006-2008 Yossiepon Oniichan, All Rights Reserved."));
252+ _T(PLUGIN_CAPTION_JP) _T(" ") _T(PLUGIN_VERSION) _T("\nCopyright (C) 2006-2009 Yossiepon Oniichan, All Rights Reserved."));
251253
252254 DECLARE_COMPONENT_VERSION(g_pluginCaption8, g_pluginVersion8, g_pluginAbout8);
253255
@@ -3511,8 +3513,7 @@
35113513 double pos3 = pfc_string_to_float(cfg_send_interval3);
35123514 uSendMessage(hSendInterval3, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pos3);
35133515
3514- uSetDlgItemText(wnd, IDC_VERSION, PLUGIN_CAPTION " " PLUGIN_VERSION);
3515- uSetDlgItemText(wnd, IDC_BUILD, "build on " __DATE__ ", " __TIME__);
3516+ setDlgVersionInfo(wnd, IDC_VERSION, IDC_BUILD);
35163517 }
35173518 break;
35183519
@@ -3797,8 +3798,7 @@
37973798 uEnableWindow(hControlWnd, false);
37983799 }
37993800
3800- uSetDlgItemText(wnd, IDC_VERSION_ADVANCED, PLUGIN_CAPTION " " PLUGIN_VERSION);
3801- uSetDlgItemText(wnd, IDC_BUILD_ADVANCED, "build on " __DATE__ ", " __TIME__);
3801+ setDlgVersionInfo(wnd, IDC_VERSION_ADVANCED, IDC_BUILD_ADVANCED);
38023802 }
38033803 break;
38043804
@@ -4029,8 +4029,7 @@
40294029 uSendDlgItemMessage(wnd, IDC_DEBUG_PLUGIN, CB_SETCURSEL, (int)cfg_debug_plugin, 0);
40304030 uSendDlgItemMessage(wnd, IDC_DEBUG_CALLBACK, CB_SETCURSEL, (int)cfg_debug_callback, 0);
40314031
4032- uSetDlgItemText(wnd, IDC_VERSION_DEBUG, PLUGIN_CAPTION " " PLUGIN_VERSION);
4033- uSetDlgItemText(wnd, IDC_BUILD_DEBUG, "build on " __DATE__ ", " __TIME__);
4032+ setDlgVersionInfo(wnd, IDC_VERSION_DEBUG, IDC_BUILD_DEBUG);
40344033 }
40354034 break;
40364035
@@ -4209,6 +4208,17 @@
42094208 LOG_ERROR(_T("%s - コード: %08x, 理由: %s"), pMethod, dwErrCode, errMsg.c_str());
42104209 }
42114210
4211+void setDlgVersionInfo(HWND wnd, UINT idc_version, UINT idc_build) {
4212+
4213+ StrDBCS64K version;
4214+
4215+ sprintf_s(version, sizeof(StrDBCS64K), PLUGIN_CAPTION " " PLUGIN_VERSION " with SDK%d (compatible%d)",
4216+ foobar2000_client::FOOBAR2000_CLIENT_VERSION, foobar2000_client::FOOBAR2000_CLIENT_VERSION_COMPATIBLE);
4217+
4218+ uSetDlgItemText(wnd, idc_version, version);
4219+ uSetDlgItemText(wnd, idc_build, "build on " __DATE__ ", " __TIME__);
4220+}
4221+
42124222 void DebugPrint(int severity, LPCTSTR lpszFormat, ...)
42134223 {
42144224 static Str64K buf;
Afficher sur ancien navigateur de dépôt.