Changeset 60

Timestamp:

Sep 22, 2023, 8:14:23 PM (2 years ago)

Author:

gyoung

Message:

Fix time being appended to title instead of replacing the last line

File:

• trunk/classes/c/c_audio/cwaudio.c (modified) (7 diffs)

trunk/classes/c/c_audio/cwaudio.c

@@ -1230 +1230 @@
             OPENPARAMS * pParams;
             MMAudio * thisPtr;
+            char *s;
             
             pParams=PVOIDFROMMP(mp2);/* Get parameter block */
@@ -1396 +1397 @@
                 /* Set Time in icon title to 00:00 */
                 strncpy(chrCommand, _wpQueryTitle(thisPtr), CCHMAXPATH);
+                s = strchr(chrCommand, '\n');
+                if (s)
+                  *s = 0;
                 if(_ulPlaySecs) {
                   sprintf(retMsg, "%02d:%02d", _ulPlaySecs/60, _ulPlaySecs%60);                  
@@ -1518 +1522 @@
 
         if(somIsObj(thisPtr)) {
-          char retMsg[50];
-          unsigned char chrCommand[CCHMAXPATH+20];
+          char retMsg[50] = {0};
+          unsigned char chrCommand[CCHMAXPATH+20] = {0};
           APIRET rc;
           ULONG ulCur;
           MMAudioData *somThis = MMAudioGetData(thisPtr);
-
+          char *s;
 
           /*@@CHANGE 0.2.8:
@@ -1549 +1553 @@
 
           strncpy(chrCommand, _wpQueryTitle(thisPtr), CCHMAXPATH);
-          strncat(chrCommand,"\n",sizeof(chrCommand)-1-strlen(chrCommand));
+          s = strchr(chrCommand, '\n');
+              if (s)
+               *s = 0;
+          strncat(chrCommand,"\n",sizeof(chrCommand)-1-strlen(chrCommand));
           if(_ulPlaySecs) {
             sprintf(retMsg, "%02d:%02d / %02d:%02d", ulCur/60, ulCur%60, _ulPlaySecs/60, _ulPlaySecs%60);
@@ -2946 +2953 @@
         {
           if(iRunningAudioFiles<MAX_AUDIOFILE_STARTS) {
-            /*
-              @@CHANGE 0.2.8
-
-              Workaround for WPS chrash with Timidity: Open 'ID_MENU_START' disabled.
-             */
-            //if(globalHaveTimidity && somObjectIsA(somSelf, "MMMidi"))
-            //  return NULLHANDLE,
+            
             /* Another audio file running */
             iRunningAudioFiles++;
 
-            __set_ulPreviousView(somSelf, _wpQueryDefaultView(somSelf));/* Save the view set by the user                  */
-            _cwmmPlayTrack(somSelf, hwndCnr, TRUE);      /* Start playing 
+            __set_ulPreviousView(somSelf, _wpQueryDefaultView(somSelf));/* Save the view set by the user */
+            _cwmmPlayTrack(somSelf, hwndCnr, TRUE);      /* Start playing*/
             _wpSetDefaultView(somSelf, ID_MENU_STOP);    /* Set new view so doubleclick stops the playing. */
           }
@@ -2964 +2965 @@
       case ID_MENU_STOP:
         {
-          _cwmmPlayTrack(somSelf, hwndCnr, FALSE);     /* Stop playing                                   */
+          _cwmmPlayTrack(somSelf, hwndCnr, FALSE);     /* Stop playing */
           _wpSetDefaultView(somSelf, __get_ulPreviousView(somSelf)); /* Restore the user view                          */
           return NULLHANDLE;
@@ -3524 +3525 @@
     /* Default view for audio objects is 'Start' so on doubleclick the playing starts
        immediately. */
-    /*
-      @@CHANGE 0.2.8
-
-      Set default view for midi files to player when Timidity is installed. 'Start'
-      menu isn't available then (see cwmidi.c).
-     */
-    //if(globalHaveTimidity && somObjectIsA(somSelf, "M_MMMidi"))
-      //return ID_MENU_PLAYER;
 
     return ID_MENU_START;
-    //    return (M_CWAudio_parent_M_MMAudio_wpclsQueryDefaultView(somSelf));
 }