Changeset 104 for trunk/classes/mm-progs/master_volume/volume.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/master_volume/volume.c (modified) (30 diffs)

trunk/classes/mm-progs/master_volume/volume.c

@@ -17 +17 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */          
+ */
 /*
  * 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/
@@ -35 +35 @@
 #define INCL_MMIOOS2
 #define INCL_MCIOS2
-#define INCL_SECONDARYWINDOW    
-#define INCL_GRAPHICBUTTON 
+#define INCL_SECONDARYWINDOW
+#define INCL_GRAPHICBUTTON
 #include <os2.h>
 #include <sw.h>
@@ -73 +73 @@
 BOOL bHaveWindowPos=FALSE;
 
-BOOL bMute=FALSE; 
+BOOL bMute=FALSE;
 HMODULE RESSOURCEHANDLE=0;
 int bTBVisible=0;
@@ -134 +134 @@
 
 /* Masteraudio does not support NOTIFY so use a thread to prevent PM freeze */
-MRESULT EXPENTRY volumeObjectProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
+MRESULT EXPENTRY volumeObjectProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   switch(msg)
@@ -153 +153 @@
               ULONG mastervolume;              /* Set to master volumepercentage
                                                   percentage by this example      */
-              
+
               USHORT usDeviceID=0;
               MCI_MASTERAUDIO_PARMS masteraudioparms;
@@ -161 +161 @@
               memset(&openParms,0, sizeof(openParms));
               openParms.pszDeviceType="Masteraudio";
- 
+
               rc=mciSendCommand(0,       /* Device                          */
                              MCI_OPEN,                /* Master audio message            */
@@ -171 +171 @@
               mciGetErrorString(rc,chrCommand, sizeof(chrCommand));
               //sprintf(chrCommand, "%x", rc);
-              WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrCommand, "", 1234, MB_MOVEABLE);              
+              WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrCommand, "", 1234, MB_MOVEABLE);
               DosBeep(5000, 10);
               usDeviceID=openParms.usDeviceID;
@@ -178 +178 @@
               /* Get current system master
                  volume setting                  */
-              
+
               mciSendCommand(usDeviceID,       /* Device                          */
                              MCI_MASTERAUDIO,                /* Master audio message            */
@@ -188 +188 @@
               /* Get current system master
                  volume setting                  */
-              
+
               mciSendCommand(usDeviceID,       /* Device                          */
                              MCI_MASTERAUDIO,                /* Master audio message            */
@@ -195 +195 @@
                              (PVOID) &masteraudioparms,      /* Data structure                  */
                              0);                             /* User parm                       */
-              
+
               mastervolume = masteraudioparms.ulReturn;
                           DosBeep(500, 10);
@@ -228 +228 @@
 }
 
-void _Optlink volumeThreadFunc (void *arg)
+void volumeThreadFunc (void *arg)
 {
   HAB  hab;
@@ -238 +238 @@
     hmq=WinCreateMsgQueue(hab,0);
     if(hmq) {
-      
+
       if((hwndThread=WinCreateWindow(HWND_OBJECT, WC_STATIC, "", 0,0,0,0,0, NULLHANDLE,
                                      HWND_BOTTOM, 1, NULLHANDLE, NULLHANDLE))==NULLHANDLE) {
@@ -245 +245 @@
       }
       WinSubclassWindow(hwndThread,&volumeObjectProc);
-      /* Window created. */             
+      /* Window created. */
 
       while(WinGetMsg(hab,&qmsg,(HWND)NULL,0,0))
         WinDispatchMsg(hab,&qmsg);
       WinDestroyWindow(hwndThread);
-      
+
       WinDestroyMsgQueue(hmq);
     }
@@ -267 +267 @@
   if((hwndTitleBar=WinWindowFromID(hwnd, FID_TITLEBAR))==NULLHANDLE)
     return;
-      
+
   hwndPopup = WinLoadMenu(hwnd, RESSOURCEHANDLE, IDM_POPUP);
   if (hwndPopup == NULLHANDLE)
     return;
-  
+
   bVisible=WinIsWindowVisible(hwndTitleBar);
 
   if(!bVisible)
-    WinSendMsg(hwndPopup,MM_SETITEMATTR,MPFROM2SHORT(IDM_ITEMTITLEBAR,FALSE), 
+    WinSendMsg(hwndPopup,MM_SETITEMATTR,MPFROM2SHORT(IDM_ITEMTITLEBAR,FALSE),
                MPFROM2SHORT(MIA_CHECKED,MIA_CHECKED));
 
   WinQueryPointerPos(HWND_DESKTOP, &ptl) ;
   WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
-  WinPopupMenu(hwnd, hwnd, hwndPopup, 
+  WinPopupMenu(hwnd, hwnd, hwndPopup,
                ptl.x, ptl.y, IDM_ITEMEXIT, PU_HCONSTRAIN | PU_VCONSTRAIN |
                PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  );
@@ -296 +296 @@
       if(!WinQueryWindowPos(hwndTitleBar,&swp))
         return FALSE;
-      
+
       if(!WinQueryWindowPos(hwnd,&swpFrame))
         return FALSE;
-      
+
       /* Shrink or expand the frame */
       if(!bTBVisible) {
-        WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//-swp.cy, 
+        WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//-swp.cy,
                         swpFrame.cx, swpFrame.cy+swp.cy, SWP_SIZE|SWP_MOVE);
         bTBVisible=TRUE;
@@ -308 +308 @@
       else
         {
-          WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//+swp.cy, 
+          WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//+swp.cy,
                           swpFrame.cx, swpFrame.cy-swp.cy, SWP_SIZE|SWP_MOVE);
           bTBVisible=FALSE;
         }
     }
-  WinSendMsg(hwnd,WM_UPDATEFRAME,0,0);      
+  WinSendMsg(hwnd,WM_UPDATEFRAME,0,0);
   return TRUE;
 }
@@ -326 +326 @@
 
   switch (msg)
-    {      
+    {
     case WM_INITDLG:
       {
@@ -345 +345 @@
                     (MPARAM) 0L,
                     (MPARAM) 100L);
-        
+
         WinSendMsg( WinWindowFromID(hwnd, IDCS_VOLUME),
                     CSM_SETINCREMENT,
                     (MPARAM) 10L,
                     (MPARAM) 1L);
-        
-        
+
+
         WinSendMsg( WinWindowFromID(hwnd, IDCS_VOLUME),
                     CSM_SETVALUE,
                     (MPARAM) queryMasterVolume(),
                     (MPARAM) NULL);
-        
-        
+
+
         // getMessage(title, IDSTR_CONVERTCHANNELS, sizeof(title), RESSOURCEHANDLE, hwnd);
         /* Set dialog font to WarpSans for Warp 4 and above */
@@ -365 +365 @@
                           DEFAULT_DIALOG_FONT );
         }
-        
+
         hpProgramIcon =
           WinLoadPointer(
@@ -371 +371 @@
                          (HMODULE) NULL,              /* Resource is kept in .Exe file. */
                          ID_ICONVOLUME );                   /* Which icon to use.             */
-        
+
         WinSendMsg(
                    hwnd,                    /* Dialog window handle.                 */
@@ -399 +399 @@
                             PP_BACKGROUNDCOLOR,(ULONG)sizeof(rgb), &rgb);
           }
-        ulSize=sizeof(RGB);        
+        ulSize=sizeof(RGB);
         if(IniRestoreData(chrIniFile, INI_VOLUME_APP, INI_BTNFGCLR_KEY, &rgb, &ulSize))
           {
@@ -428 +428 @@
         /* Remove top frame controls if titlebar is hidden */
         SHORT countSwp;
-                
+
         countSwp = (int) WinDefDlgProc(hwnd, msg, mp1, mp2);
         if(countSwp) {
-          if(bTBVisible==0) { 
-            /* Hide frame controls */        
+          if(bTBVisible==0) {
+            /* Hide frame controls */
             /* countSWP:  number of standard framecontrols
                pswp:      Array of SWP describing the framecontrols.
@@ -439 +439 @@
             PSWP pswpTB=NULLHANDLE;
             PSWP pswp=(PSWP)mp1;
-            int y, cy;
+            int y;
 
             for (a = 0; a < countSwp; a++)
@@ -448 +448 @@
                     pswpTB=&pswp[a];
                     y=pswp[a].y;
-                    cy=pswp[a].cy;
                     //    DosBeep(500,600);
                     break;
@@ -485 +484 @@
     case WM_BUTTON1MOTIONSTART:
       /* Drag the window without titlebar */
-      WinSendMsg(hwnd, WM_TRACKFRAME, 
+      WinSendMsg(hwnd, WM_TRACKFRAME,
                  MPFROMSHORT(TF_MOVE   /*| TF_SETPOINTERPOS */), NULL) ;
       return (MRESULT) 0 ;
@@ -504 +503 @@
            {
              if (SHORT2FROMMP(mp1)==GBN_BUTTONDOWN) {
-               bMute=TRUE; 
+               bMute=TRUE;
                setMasterVolume(hwnd, 0);
              }
              else if (SHORT2FROMMP(mp1)==GBN_BUTTONUP) {
                SHORT sValue;
-               
+
                bMute=FALSE;
                WinSendMsg(WinWindowFromID(hwnd, IDCS_VOLUME),CSM_QUERYVALUE ,MPFROMP(&sValue) ,0);
@@ -524 +523 @@
         memset(&masteraudioparms,0, sizeof(masteraudioparms));
         /* Save master audio level */
-        mciSendCommand( 0,       
+        mciSendCommand( 0,
                        MCI_MASTERAUDIO,                /* Master audio message            */
                        MCI_WAIT |  MCI_MASTERVOL | MCI_SAVESETTING,
@@ -594 +593 @@
       bTBVisible=IniRestoreInt(chrIniFile, INI_VOLUME_APP, INI_TBVISIBLE_KEY, 1);
 
-      if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, 
+      if( WinDlgBox( HWND_DESKTOP, NULLHANDLE,
                      volumeDialogProc, RESSOURCEHANDLE, IDDLG_VOLUME, 0) == DID_ERROR )
         {
           /*
-            Text:   
-            Title:  "Installation problem"                       
+            Text:
+            Title:  "Installation problem"
             */
 #if 0
@@ -605 +604 @@
                       title, IDSTR_INSTALLERRORTITLE , sizeof(title),
                       RESSOURCEHANDLE, HWND_DESKTOP, MB_OK | MB_ICONEXCLAMATION | MB_MOVEABLE);
-#endif       
+#endif
           WinDestroyMsgQueue( hmq );
           WinTerminate( hab );
@@ -637 +636 @@
                   (MPARAM) NULL);
       while ( WinGetMsg( hab, (PQMSG) &qmsg, (HWND) NULL, 0, 0) )
-        WinDispatchMsg( hab, (PQMSG) &qmsg );  
+        WinDispatchMsg( hab, (PQMSG) &qmsg );
 #endif
       freeResHandle();