Changeset 60
- Timestamp:
- Sep 22, 2023, 8:14:23 PM (23 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/classes/c/c_audio/cwaudio.c
r58 r60 1230 1230 OPENPARAMS * pParams; 1231 1231 MMAudio * thisPtr; 1232 char *s; 1232 1233 1233 1234 pParams=PVOIDFROMMP(mp2);/* Get parameter block */ … … 1396 1397 /* Set Time in icon title to 00:00 */ 1397 1398 strncpy(chrCommand, _wpQueryTitle(thisPtr), CCHMAXPATH); 1399 s = strchr(chrCommand, '\n'); 1400 if (s) 1401 *s = 0; 1398 1402 if(_ulPlaySecs) { 1399 1403 sprintf(retMsg, "%02d:%02d", _ulPlaySecs/60, _ulPlaySecs%60); … … 1518 1522 1519 1523 if(somIsObj(thisPtr)) { 1520 char retMsg[50] ;1521 unsigned char chrCommand[CCHMAXPATH+20] ;1524 char retMsg[50] = {0}; 1525 unsigned char chrCommand[CCHMAXPATH+20] = {0}; 1522 1526 APIRET rc; 1523 1527 ULONG ulCur; 1524 1528 MMAudioData *somThis = MMAudioGetData(thisPtr); 1525 1529 char *s; 1526 1530 1527 1531 /*@@CHANGE 0.2.8: … … 1549 1553 1550 1554 strncpy(chrCommand, _wpQueryTitle(thisPtr), CCHMAXPATH); 1551 strncat(chrCommand,"\n",sizeof(chrCommand)-1-strlen(chrCommand)); 1555 s = strchr(chrCommand, '\n'); 1556 if (s) 1557 *s = 0; 1558 strncat(chrCommand,"\n",sizeof(chrCommand)-1-strlen(chrCommand)); 1552 1559 if(_ulPlaySecs) { 1553 1560 sprintf(retMsg, "%02d:%02d / %02d:%02d", ulCur/60, ulCur%60, _ulPlaySecs/60, _ulPlaySecs%60); … … 2946 2953 { 2947 2954 if(iRunningAudioFiles<MAX_AUDIOFILE_STARTS) { 2948 /* 2949 @@CHANGE 0.2.8 2950 2951 Workaround for WPS chrash with Timidity: Open 'ID_MENU_START' disabled. 2952 */ 2953 //if(globalHaveTimidity && somObjectIsA(somSelf, "MMMidi")) 2954 // return NULLHANDLE, 2955 2955 2956 /* Another audio file running */ 2956 2957 iRunningAudioFiles++; 2957 2958 2958 __set_ulPreviousView(somSelf, _wpQueryDefaultView(somSelf));/* Save the view set by the user 2959 _cwmmPlayTrack(somSelf, hwndCnr, TRUE); /* Start playing 2959 __set_ulPreviousView(somSelf, _wpQueryDefaultView(somSelf));/* Save the view set by the user */ 2960 _cwmmPlayTrack(somSelf, hwndCnr, TRUE); /* Start playing*/ 2960 2961 _wpSetDefaultView(somSelf, ID_MENU_STOP); /* Set new view so doubleclick stops the playing. */ 2961 2962 } … … 2964 2965 case ID_MENU_STOP: 2965 2966 { 2966 _cwmmPlayTrack(somSelf, hwndCnr, FALSE); /* Stop playing 2967 _cwmmPlayTrack(somSelf, hwndCnr, FALSE); /* Stop playing */ 2967 2968 _wpSetDefaultView(somSelf, __get_ulPreviousView(somSelf)); /* Restore the user view */ 2968 2969 return NULLHANDLE; … … 3524 3525 /* Default view for audio objects is 'Start' so on doubleclick the playing starts 3525 3526 immediately. */ 3526 /*3527 @@CHANGE 0.2.83528 3529 Set default view for midi files to player when Timidity is installed. 'Start'3530 menu isn't available then (see cwmidi.c).3531 */3532 //if(globalHaveTimidity && somObjectIsA(somSelf, "M_MMMidi"))3533 //return ID_MENU_PLAYER;3534 3527 3535 3528 return ID_MENU_START; 3536 // return (M_CWAudio_parent_M_MMAudio_wpclsQueryDefaultView(somSelf));3537 3529 } 3538 3530
Note:
See TracChangeset
for help on using the changeset viewer.