Changeset 258

Timestamp:

03/30/07 13:53:50 (17 years ago)

Author:

r2d

Message:

• corrected a bug crashing winamp when trying to see informations on a non-existing mpc file
• added link in the logo

Location:

winamp-musepack/trunk

Files:

• mpc_player.cpp (modified) (4 diffs)
• resource.h (modified) (3 diffs)
• winamp-musepack.rc (modified) (1 diff)

winamp-musepack/trunk/mpc_player.cpp

@@ -86 +86 @@
         wait_event = 0;
         tag_file = 0;
+        lastfn[0] = 0;
         
         TagLib::FileRef fileRef;
@@ -120 +121 @@
                 tag_file = 0;
         }
+        lastfn[0] = 0;
 }
 
@@ -329 +331 @@
 void mpc_player::initDlg(HWND hDlg)
 {
+        if (lastfn[0] == 0) {
+                SetDlgItemText(hDlg, IDC_FILE, "Can't open file");
+                return;
+        }
+
         std::ostringstream tmp;
 
@@ -405 +412 @@
                         EndDialog(hDlg, LOWORD(wParam));
                         return TRUE;
+                } else if (LOWORD(wParam) == IDC_LOGO) {
+                        ShellExecute( hDlg, "open", "http://www.musepack.com", NULL, NULL, SW_NORMAL);
                 }
                 break;

winamp-musepack/trunk/resource.h

@@ -5 +5 @@
 #define IDD_FORMVIEW                    101
 #define IDD_INFO_BOX                    101
-#define IDB_LOGO                        106
+#define IDB_LOGO                        102
 #define IDC_STREAM_INFO                 1001
 #define IDC_TITLE                       1002
@@ -18 +18 @@
 #define IDC_COMMENT                     1011
 #define IDC_FILE                        1012
+#define IDC_LOGO                        1013
 #define IDC_STATIC                      -1
 
@@ -24 +25 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        107
+#define _APS_NEXT_RESOURCE_VALUE        103
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1014

winamp-musepack/trunk/winamp-musepack.rc

@@ -85 +85 @@
     EDITTEXT        IDC_FILE,24,6,376,12,ES_AUTOHSCROLL | ES_READONLY
     RTEXT           "File",IDC_STATIC,6,8,12,8
-    CONTROL         106,IDC_STATIC,"Static",SS_BITMAP,264,152,136,46
+    CONTROL         IDB_LOGO,IDC_LOGO,"Static",SS_BITMAP | SS_NOTIFY,264,152,136,
+                    46
     LTEXT           "",IDC_STREAM_INFO,268,25,129,124
 END