Changeset 3 for trunk/classes/c/c_audio/cwastream.c

Timestamp:

Jul 13, 2017, 4:16:49 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-eCS-Refresh-13_05_05.zip dated 2005-05-13

File:

• trunk/classes/c/c_audio/cwastream.c (modified) (5 diffs)

trunk/classes/c/c_audio/cwastream.c

@@ -129 +129 @@
         OPENPARAMS * pParams;
 
-        pParams=PVOIDFROMMP(mp2);/* Get parameter block */
-        if(!pParams)
-          {
-            WinPostMsg(hwnd,WM_QUIT,0,0);
-            return MRFALSE;
-          }
-
-        WinSetWindowULong(hwnd, QWL_USER, (ULONG)pParams);        
-        thisPtr=pParams->wpObject;
+        /* Depending on mp1 the parameter in mp2 is either a pointer
+           to OPENPARAMS (mp1==ACKEY_START) or the object pointer (mp1==ACK_STOP) */
+        if(ACKEY_START==LONGFROMMP(mp1)) {
+          pParams=PVOIDFROMMP(mp2);/* Get parameter block */
+          if(!pParams)
+            {
+              WinPostMsg(hwnd,WM_QUIT,0,0);
+              return MRFALSE;
+            }
+          WinSetWindowULong(hwnd, QWL_USER, (ULONG)pParams);        
+          thisPtr=pParams->wpObject;
+        }
+        else
+          thisPtr=(MMAudio*)PVOIDFROMMP(mp2);
 
         if(somIsObj(thisPtr)) {
@@ -169 +174 @@
                       _cwmmSetRecordTitles(thisPtr, "Can't connect to server!", TRUE);
                       WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 2, 4000);
-                      /*                    WinPostMsg(hwnd,WM_QUIT,0,0);*/
                       return MRFALSE;
                     }
@@ -202 +206 @@
 
                 WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 );
-                
+
                 sprintf(chrCommand,"stop wave%d wait", thisPtr);
                 mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
@@ -276 +280 @@
 }
 
+
 MRESULT EXPENTRY streamUrlDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
@@ -288 +293 @@
         WinSetWindowULong(WinWindowFromID(hwnd,IDEF_URL),
                           QWL_USER,(ULONG)cwAudioStream);//Save object ptr.
-        
+
         WinSendMsg(WinWindowFromID(hwnd,IDEF_URL),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(chrURL)),0);