Changeset 3 for trunk/classes

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

Location:

trunk/classes

Files:

• REPLACE.CMD (modified) (1 diff)
• c/c_audio/cwastream.c (modified) (5 diffs)
• c/c_audio/cwaudio.c (modified) (3 diffs)
• c/cwmm.DEF (modified) (1 diff)

trunk/classes/REPLACE.CMD

@@ -1 +1 @@
 /* rexx -  replace  DLL */
 
-
+'replace H:\cwmm\classes\cwmm.dll D:\MMOS2\MMCLASS\CWMM.DLL'
+'replace H:\cwmm\classes\Res\dll\mmres_DE.dll d:\MMOS2\MMCLASS\bin\mmres_DE.dll'
+'replace H:\cwmm\classes\Res\dll\mmres_EN.dll d:\MMOS2\MMCLASS\bin\mmres_EN.dll'
 
 'replace H:\cwmm\classes\cwmm.dll J:\MMOS2\CWMM\CWMM.DLL'

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);
 

trunk/classes/c/c_audio/cwaudio.c

@@ -3494 +3494 @@
       BOOL bContinue=FALSE;
       MMAudio *somSelf=(MMAudio*)mp1;
+      WPObject    *pLinkObj=NULLHANDLE;
       MMAudioData *somThis= MMAudioGetData(somSelf);
       ULONG ulLoop;
@@ -3534 +3535 @@
 
             Check if parent folder is closed. If yes, don't start file scanning.
+
+            @@CHANGE 0.2.9
+
+            Check if we have a shadow in an open folder.
+
             */
+
           wpFolder=_wpQueryFolder(somSelf);
           if(somIsObj(wpFolder)) {
-            if(!_wpFindViewItem(wpFolder , VIEW_ANY, NULLHANDLE))
-              break;
-          }
-          
+            if(!_wpFindViewItem(wpFolder , VIEW_ANY, NULLHANDLE)) {
+              PUSEITEM pUseItem;
+              BOOL fOpenView=FALSE;
+              /* Ok, our object isn't in an open folder, but we may have a shadow somewhere in an
+                 open folder. */
+              for(pUseItem=_wpFindUseItem(somSelf, USAGE_LINK, NULL);pUseItem;
+                  pUseItem=_wpFindUseItem(somSelf, USAGE_LINK, pUseItem))
+                {
+                  PLINKITEM pLI=(PLINKITEM)++pUseItem;
+                  pLinkObj=pLI->LinkObj; /* The awake shadow */
+
+                  if(somIsObj(pLinkObj)) {
+                    wpFolder=_wpQueryFolder(pLinkObj);
+                    if(somIsObj(wpFolder)) {
+                      if(_wpFindViewItem(wpFolder , VIEW_ANY, NULLHANDLE)) {
+                        fOpenView=TRUE;
+                        break;
+                      }
+                    }/* somIsObj(wpFolder) */
+                  }
+                }/* for() */
+              if(!fOpenView)
+                break;
+            }
+          }
+
           /* Get file name */
           ulSize=sizeof(fName);
@@ -3830 +3859 @@
         if(ulLoop<20)
           _wpSaveDeferred(somSelf);
+        /* Now we have the audio info */
         _wpCnrRefreshDetails(somSelf);
-
+        /*
+          @@CHANGE 0.2.9
+
+          Also refresh shadows in containers. For now we only support one shadow but that doesn't is a problem
+          because after the first shadow the linked object has queried the audio data and every other shadow
+          that will be awaked can use that info without ending here. Only problem may be the user opens a lot
+          of folders with shadows and we are not fast enough but I don't care at the momen ;-).
+         */
+        if(pLinkObj!=NULLHANDLE && somIsObj(pLinkObj)) /* The check on NULLHANDLE is very fast while somIsObj() needs 
+                                                          quite some time. So we check for a valid object only if we
+                                                          can be quite sure we have an object (pointer!=NULLHANDLE). */
+          _wpCnrRefreshDetails(pLinkObj);
         return (MRESULT) FALSE;
       }

trunk/classes/c/cwmm.DEF

@@ -25 +25 @@
 
 LIBRARY CWMM INITGLOBAL
-DESCRIPTION '$@#(C) C. Wohlgemuth 2005:0.2        #@##1## 21/03/05 23:20:28        My ;-)  ::::9::@@CWMM-classes V0.2.9'
+DESCRIPTION '$@#(C) C. Wohlgemuth 2005:0.2        #@##1## 11/05/05 17:35:09        My ;-)  ::::9::@@CWMM-classes V0.2.9'
 
 PROTMODE