Changeset 104 for trunk/classes/mm-progs/MMPlayer/mmplayer.c

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• classes/mm-progs/MMPlayer/mmplayer.c (modified) (39 diffs)

trunk/classes/mm-progs/MMPlayer/mmplayer.c

@@ -21 +21 @@
  * If you need another license for your project/product (commercial,
  * noncommercial, whatever) contact me at
- * 
+ *
  * http://www.os2world.com/cdwriting
  * http://www.geocities.com/SiliconValley/Sector/5785/
@@ -52 +52 @@
 #include "sys_funcs.h"
 
-#ifndef OPEN_DEFAULT 
+#ifndef OPEN_DEFAULT
 /*  Open views for the wpOpen() method */
 
@@ -135 +135 @@
 
 /* Every folder has one running play thread to handle play commands */
-void _Optlink playThreadFunc (void *arg);
+void playThreadFunc (void *arg);
 void controlPlaying(HWND hwndDialog, ULONG ulAction, ULONG ulReserved);
 BOOL stopAudioFile(HWND hwndFrame);
@@ -211 +211 @@
   WinQueryPointerPos(HWND_DESKTOP, &ptl) ;
   WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
-  WinPopupMenu(hwnd, hwnd, hwndPopup, 
+  WinPopupMenu(hwnd, hwnd, hwndPopup,
                ptl.x, ptl.y, 0, PU_HCONSTRAIN | PU_VCONSTRAIN |
-               PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  ); 
-  
+               PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  );
+
 }
 
@@ -227 +227 @@
   hResource=BMP_RESSOURCEHANDLE; //_queryResModuleHandle();
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0);
@@ -327 +327 @@
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclSource.xLeft,ci.rclSource.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
-                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE); 
+                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE);
   oldPlayTimeProc=WinSubclassWindow(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), playTimeTextProc);
 
   /* Pos slider */
   ci=ciControls[CTRLIDX_POSSLIDER];//ciPosSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
                   ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE | SWP_SIZE);
-  
+
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
   /* Vol slider */
   ci=ciControls[CTRLIDX_VOLSLIDER];//ciVolSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
@@ -351 +351 @@
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
 }
@@ -370 +370 @@
   if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
     /* Problem with MCI. Clean up. The Timer will be stopped in the method */
-    stopAudioFile(hwndFrame); 
+    stopAudioFile(hwndFrame);
   }
   else {
     if(!stricmp(retMsg, "stopped")) {
       /* Audio file played. */
-      stopAudioFile(hwndFrame); 
+      stopAudioFile(hwndFrame);
     }
     showPlayTimeDisplay(hwndFrame, TRUE);/* Ensure display is visible */
@@ -391 +391 @@
       return usItems;
     }
-  
+
   return 0;
 }
@@ -397 +397 @@
 BOOL DrgVerifyTypeCW(PDRAGITEM pDragItem, char * chrType)
 {
-  /* DrgVerifyType() seems not to work when several types are in the list?? 
+  /* DrgVerifyType() seems not to work when several types are in the list??
      Dokumentation says, it works... */
   /* Only check for a single type for now */
@@ -467 +467 @@
     for(ulHash=0;*theString!='\0'; theString++)
       ulHash=*theString+37*ulHash;
-  
+
   return ulHash%HASHSIZE;
 }
@@ -538 +538 @@
 MRESULT handleDrag0ver(PDRAGINFO pdi, HWND hwnd)
 {
-  
+
   /* Only accept one file */
   if(DrgGetNumObjects(pdi)!=1) {
@@ -546 +546 @@
   if(DrgCheckForKnownType(pdi, hwnd))
     return MRFROM2SHORT(DOR_DROP, DO_COPY);
-  
-  return MRFROM2SHORT(DOR_NEVERDROP, DO_COPY);  
+
+  return MRFROM2SHORT(DOR_NEVERDROP, DO_COPY);
 }
 
@@ -562 +562 @@
       char chrFile[CCHMAXPATH];
       PDRAGITEM pDragItem;
-      
+
       pDragItem=DrgQueryDragitemPtr(pdi, 0);
-      DrgQueryStrName(pDragItem->hstrSourceName,sizeof(chrFile), chrFile); 
-      DrgQueryStrName(pDragItem->hstrContainerName,sizeof(chrSourceName), chrSourceName); 
+      DrgQueryStrName(pDragItem->hstrSourceName,sizeof(chrFile), chrFile);
+      DrgQueryStrName(pDragItem->hstrContainerName,sizeof(chrSourceName), chrSourceName);
       strcat(chrSourceName, chrFile);
-      
+
       /* Start new file */
       controlPlaying(hwnd, PLAY_FIRST, 0);
@@ -608 +608 @@
              MPFROM2SHORT(SC_SIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Minimize from the system menu */
              MM_DELETEITEM,
              MPFROM2SHORT(SC_MINIMIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Maximize from the system menu */
              MM_DELETEITEM,
@@ -648 +648 @@
 
   switch (msg)
-    {      
+    {
     case DM_DRAGOVER:
       {
@@ -676 +676 @@
         swctl.fbJump=SWL_JUMPABLE;
         WinAddSwitchEntry(&swctl);
-        
+
         adjustDialogControlPos(hwnd);
-        
+
         /* Set volume slider*/
         WinSendMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERVOLUME),
@@ -684 +684 @@
                     MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
                     MPFROMLONG( ulVolume));
-        
+
         /* Subclass buttons for DnD */
         orgButtonProc=WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERPLAY), buttonProc);
         WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERPAUSE), buttonProc);
         WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERSTOP), buttonProc);
-                
+
         FixSysMenu(hwnd);
 
@@ -695 +695 @@
         if(allBMPs[MAIN_BMP_IDX].hbm) {
           SWP swp;
-          
-          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);         
-          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLIENT), NULLHANDLE, 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME), 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME), 
+
+          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);
+          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLIENT), NULLHANDLE,
+                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME),
+                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME),
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy,
                           SWP_SIZE|SWP_MOVE);
           orgBgProc=WinSubclassWindow(WinWindowFromID(hwnd, ID_CLIENT), bgProc);
-          
+
           WinSetWindowPos(hwnd, NULLHANDLE, 0, 0,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx+WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME)*2,
@@ -732 +732 @@
       /*****************************************************/
     case WM_APPTERMINATENOTIFY:
-      
+
       switch(SHORT1FROMMP(mp1))
         {
@@ -745 +745 @@
           return MRFALSE;
         case NOTIFY_CONTEXT:
-          /* Show context menu. */            
+          /* Show context menu. */
           HlpContextMenu(hwnd, iWhichDisplay+ID_MENUITEMELAPSED, TRUE);
           return MRFALSE;
@@ -752 +752 @@
         }
       return MRFALSE;
-      
+
       /*****************************************************/
       /* The following two messages are for device sharing */
@@ -760 +760 @@
         char chrCommand[100];
         int iWavePriv;
-    
+
         iWavePriv=ulPid;
 
@@ -791 +791 @@
       /* SETPOSITIONADVICE does not work for some reason,  */
       /* so a timer is used. Yes, it's quit cumbersome...  */
-      /*****************************************************/  
+      /*****************************************************/
     case WM_TIMER:
       if(SHORT1FROMMP(mp1)==IDTIMER_PLAY) {
@@ -812 +812 @@
             /* Set slider position */
 
-            WinPostMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERPOSBAR), 
+            WinPostMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERPOSBAR),
                         SLM_SETSLIDERINFO,
                         MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
@@ -898 +898 @@
         default:
           break;
-        }              
+        }
       break;
 
@@ -909 +909 @@
         char chrCommand[50];
         char retMsg[20];
-        
+
         switch(SHORT2FROMMP(mp1))
           {
@@ -939 +939 @@
                       static long lLastPos=0;
                       long lPos=LONGFROMMP(mp2);
-              
+
                       bPosDragging=TRUE;
                       lPos*=ulTotalLength/100;
                       if(lPos/1000!=lLastPos) {
                         /* Prevent flickering */
-                        sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
+                        sprintf(chrCommand, "%lu:%02lu", lPos/1000/60, (lPos/1000)%60);
                         WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
                         lLastPos=lPos/1000;
@@ -963 +963 @@
                     {
                       ULONG ulValue;
-                      
+
                       ulValue=LONGFROMMP(mp2);
                       ulVolume=ulValue;
@@ -975 +975 @@
 
                       bPosDragging=FALSE;
-                      lPos*=1000;                      
+                      lPos*=1000;
                       lPos*=ulTotalLength/100;
                       lPos/=1000;// Use only full seconds
@@ -982 +982 @@
                       seekAudioFile(lPos);
                       /* restart timer */
-                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, IDTIMER_PLAY, PLAYTIMER_DELAY);  
+                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, IDTIMER_PLAY, PLAYTIMER_DELAY);
                       ulPos=lPos/1000;
                       break;
@@ -999 +999 @@
       break;
     }/* switch */
-  
+
   return WinDefDlgProc( hwnd, msg, mp1, mp2);
 }
@@ -1019 +1019 @@
                      ))==NULLHANDLE)
     return FALSE;
-  
+
   ulSize=sizeof(chrFileName);
-  
+
   if ((rc = DosOpen(chrFileName, &handle, &act,
                     0L, 0, OPEN_ACTION_OPEN_IF_EXISTS,
@@ -1085 +1085 @@
 BOOL writeVolumeToIni(char * iniFile, char* chrApp, char *chrKey, ULONG ulVolume)
 {
-  
+
   return IniSaveInt(iniFile, chrApp, chrKey, ulVolume);
 }
@@ -1108 +1108 @@
   if(MMIO_SUCCESS!=mmioIdentifyFile(chrFile, &mmioInfo, &mmFormatInfo, &fourCC, 0,0))
     {
-      return 0; 
+      return 0;
     }
 
   if(mmFormatInfo.ulMediaType==MMIO_MEDIATYPE_MIDI)
     return 1; /* Midi */
-  
+
   /* Any other audio file */
   return 2;
@@ -1143 +1143 @@
   if(hab) {
     hmq=WinCreateMsgQueue(hab,0);
-    if(hmq) {  
-      /* Check if user started prog by hand */   
+    if(hmq) {
+      /* Check if user started prog by hand */
       if(argc!=NUMPARAMS) {/* Not the right num of params */
         pmUsage();
@@ -1161 +1161 @@
           {
             /* FIXME: Identify error !!!*/
-            
+
           };
-        
+
         if(rc==1)
           {
@@ -1176 +1176 @@
           strcpy(chrClassName, params[1]);
 
-        /* Get our ressource dll */  
+        /* Get our ressource dll */
         //        RESSOURCEHANDLE=0;
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
@@ -1189 +1189 @@
         WinRegisterClass(WinQueryAnchorBlock(HWND_DESKTOP), SLIDER_CLASS, privateSliderProc,0, SLADDBYTES);
 
-        _loadBmps();        
+        _loadBmps();
         DosGetInfoBlocks(&ptib, &ppib);
         ulPid=ppib->pib_ulpid;
         _beginthread(playThreadFunc,NULL,8192*16, NULLHANDLE); //Fehlerbehandlung fehlt
 
-        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc, 
+        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc,
                        RESSOURCEHANDLE, IDDLG_MMPLAYER, 0) == DID_ERROR )
           {
             /*
-              Text:   
-              Title:  "Installation problem"                       
-              */             
+              Text:
+              Title:  "Installation problem"
+              */
             messageBox( text, IDSTR_CONVERTDIALOGERROR , sizeof(text),
                         title, IDSTR_INSTALLERRORTITLE , sizeof(title),