Changeset 3


Ignore:
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
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.inc

    r2 r3  
    1 BUILD_STRING = -Build 201 21/03/05
     1BUILD_STRING = -Build 205 24/03/05

  • trunk/changes-0_2_9.txt

    r2 r3  
    55-Help for audio stream class.
    66-Close confirmation dialog of media folder is now modal to the folder
     7-Audio information for shadows in media folders wasn't shown when linked object wasn't touched first.
     8-Mediafolder refresh triggers new time calculation.
     9-Stop menu item of audio stream objects didn't work.
    710
    8110.2.8:

  • trunk/classes/REPLACE.CMD

    r2 r3  
    11/* rexx -  replace  DLL */
    22
    3 
     3'replace H:\cwmm\classes\cwmm.dll D:\MMOS2\MMCLASS\CWMM.DLL'
     4'replace H:\cwmm\classes\Res\dll\mmres_DE.dll d:\MMOS2\MMCLASS\bin\mmres_DE.dll'
     5'replace H:\cwmm\classes\Res\dll\mmres_EN.dll d:\MMOS2\MMCLASS\bin\mmres_EN.dll'
    46
    57'replace H:\cwmm\classes\cwmm.dll J:\MMOS2\CWMM\CWMM.DLL'

  • trunk/classes/c/c_audio/cwastream.c

    r2 r3  
    129129        OPENPARAMS * pParams;
    130130
    131         pParams=PVOIDFROMMP(mp2);/* Get parameter block */
    132         if(!pParams)
    133           {
    134             WinPostMsg(hwnd,WM_QUIT,0,0);
    135             return MRFALSE;
    136           }
    137 
    138         WinSetWindowULong(hwnd, QWL_USER, (ULONG)pParams);       
    139         thisPtr=pParams->wpObject;
     131        /* Depending on mp1 the parameter in mp2 is either a pointer
     132           to OPENPARAMS (mp1==ACKEY_START) or the object pointer (mp1==ACK_STOP) */
     133        if(ACKEY_START==LONGFROMMP(mp1)) {
     134          pParams=PVOIDFROMMP(mp2);/* Get parameter block */
     135          if(!pParams)
     136            {
     137              WinPostMsg(hwnd,WM_QUIT,0,0);
     138              return MRFALSE;
     139            }
     140          WinSetWindowULong(hwnd, QWL_USER, (ULONG)pParams);       
     141          thisPtr=pParams->wpObject;
     142        }
     143        else
     144          thisPtr=(MMAudio*)PVOIDFROMMP(mp2);
    140145
    141146        if(somIsObj(thisPtr)) {
    … …  
    169174                      _cwmmSetRecordTitles(thisPtr, "Can't connect to server!", TRUE);
    170175                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 2, 4000);
    171                       /*                    WinPostMsg(hwnd,WM_QUIT,0,0);*/
    172176                      return MRFALSE;
    173177                    }
    … …  
    202206
    203207                WinStopTimer(WinQueryAnchorBlock(hwnd),hwnd,1 );
    204                
     208
    205209                sprintf(chrCommand,"stop wave%d wait", thisPtr);
    206210                mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
    … …  
    276280}
    277281
     282
    278283MRESULT EXPENTRY streamUrlDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
    279284{
    … …  
    288293        WinSetWindowULong(WinWindowFromID(hwnd,IDEF_URL),
    289294                          QWL_USER,(ULONG)cwAudioStream);//Save object ptr.
    290        
     295
    291296        WinSendMsg(WinWindowFromID(hwnd,IDEF_URL),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)sizeof(chrURL)),0);
    292297

  • trunk/classes/c/c_audio/cwaudio.c

    r2 r3  
    34943494      BOOL bContinue=FALSE;
    34953495      MMAudio *somSelf=(MMAudio*)mp1;
     3496      WPObject    *pLinkObj=NULLHANDLE;
    34963497      MMAudioData *somThis= MMAudioGetData(somSelf);
    34973498      ULONG ulLoop;
    … …  
    35343535
    35353536            Check if parent folder is closed. If yes, don't start file scanning.
     3537
     3538            @@CHANGE 0.2.9
     3539
     3540            Check if we have a shadow in an open folder.
     3541
    35363542            */
     3543
    35373544          wpFolder=_wpQueryFolder(somSelf);
    35383545          if(somIsObj(wpFolder)) {
    3539             if(!_wpFindViewItem(wpFolder , VIEW_ANY, NULLHANDLE))
    3540               break;
    3541           }
    3542          
     3546            if(!_wpFindViewItem(wpFolder , VIEW_ANY, NULLHANDLE)) {
     3547              PUSEITEM pUseItem;
     3548              BOOL fOpenView=FALSE;
     3549              /* Ok, our object isn't in an open folder, but we may have a shadow somewhere in an
     3550                 open folder. */
     3551              for(pUseItem=_wpFindUseItem(somSelf, USAGE_LINK, NULL);pUseItem;
     3552                  pUseItem=_wpFindUseItem(somSelf, USAGE_LINK, pUseItem))
     3553                {
     3554                  PLINKITEM pLI=(PLINKITEM)++pUseItem;
     3555                  pLinkObj=pLI->LinkObj; /* The awake shadow */
     3556
     3557                  if(somIsObj(pLinkObj)) {
     3558                    wpFolder=_wpQueryFolder(pLinkObj);
     3559                    if(somIsObj(wpFolder)) {
     3560                      if(_wpFindViewItem(wpFolder , VIEW_ANY, NULLHANDLE)) {
     3561                        fOpenView=TRUE;
     3562                        break;
     3563                      }
     3564                    }/* somIsObj(wpFolder) */
     3565                  }
     3566                }/* for() */
     3567              if(!fOpenView)
     3568                break;
     3569            }
     3570          }
     3571
    35433572          /* Get file name */
    35443573          ulSize=sizeof(fName);
    … …  
    38303859        if(ulLoop<20)
    38313860          _wpSaveDeferred(somSelf);
     3861        /* Now we have the audio info */
    38323862        _wpCnrRefreshDetails(somSelf);
    3833 
     3863        /*
     3864          @@CHANGE 0.2.9
     3865
     3866          Also refresh shadows in containers. For now we only support one shadow but that doesn't is a problem
     3867          because after the first shadow the linked object has queried the audio data and every other shadow
     3868          that will be awaked can use that info without ending here. Only problem may be the user opens a lot
     3869          of folders with shadows and we are not fast enough but I don't care at the momen ;-).
     3870         */
     3871        if(pLinkObj!=NULLHANDLE && somIsObj(pLinkObj)) /* The check on NULLHANDLE is very fast while somIsObj() needs
     3872                                                          quite some time. So we check for a valid object only if we
     3873                                                          can be quite sure we have an object (pointer!=NULLHANDLE). */
     3874          _wpCnrRefreshDetails(pLinkObj);
    38343875        return (MRESULT) FALSE;
    38353876      }

  • trunk/classes/c/cwmm.DEF

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

  • trunk/make.inc

    r2 r3  
    99#That's used for createcd.exe until I find a decent documentation for make to do it better...
    1010#Also used for including the right icons
    11 ECS_COMPILE     =       YES
     11#ECS_COMPILE    =       YES
    1212
    1313ifdef    ECS_COMPILE

  • trunk/mediafolder/c/mediafldr/mediadialogprocs.cpp

    r2 r3  
    16981698          }
    16991699        }
    1700         /* Start timer which triggers time calculation */
    1701         WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd, IDTIMER_STATUS, 300);
     1700        /*
     1701           FIXME:
     1702           Start timer which triggers time calculation. The timer is rather long so the objects may
     1703           awake first. This is not yet bullet proof, because if there're a lot of objects in the folder
     1704           the time will be too short. */
     1705        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd, IDTIMER_STATUS, 5000);
    17021706        return (MRESULT)FALSE;
    17031707      }

  • trunk/mediafolder/c/mediafldr/mediafolderoverridenwpmethods.cpp

    r2 r3  
    964964}
    965965
    966 #if 0
     966//#if 0
    967967BOOL CWMediaFolder::wpRefresh(ULONG ulView, PVOID pReserved)
    968968{
    969969  somId mySomId;
    970 
    971     if((mySomId=somIdFromString("wpAddSettingsPages"))!=NULLHANDLE) {
    972       rc=((somTD_WPObject_wpAddSettingsPages)
     970  ULONG rc;
     971
     972    if((mySomId=somIdFromString("wpRefresh"))!=NULLHANDLE) {
     973      rc=((somTD_WPFileSystem_wpRefresh)
    973974          somParentNumResolve(__ClassObject->somGetPClsMtabs(),
    974975                              1,
    975976                              __ClassObject->
    976                               somGetMethodToken(mySomId))                   
    977           )(this,hwndNotebook); 
     977                              somGetMethodToken(mySomId))                 
     978          )(this, ulView,pReserved); 
    978979      SOMFree(mySomId);
    979980    }
    … …  
    981982      rc=CWProgFolder::wpRefresh(ulView, pReserved);
    982983
    983 }
    984 #endif
     984    /* Start timer which triggers time calculation */
     985    WinStartTimer(WinQueryAnchorBlock(hwndBottom),hwndBottom, IDTIMER_STATUS, 300);
     986    return rc;
     987}
     988//#endif
    985989
    986990BOOL CWMediaFolder::wpAddSettingsPages(HWND hwndNotebook)
    … …  
    988992        ULONG rc;
    989993    somId mySomId;
    990    
     994
    991995    if((mySomId=somIdFromString("wpAddSettingsPages"))!=NULLHANDLE) {
    992996      rc=((somTD_WPObject_wpAddSettingsPages)

  • trunk/mediafolder/makefile

    r2 r3  
    222222        cp ./install/freedbgr.ins ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/FreeDB/
    223223        cp Skripte_ger/* ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/Skripte/
    224 #       -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin && lxlite *
    225 #       -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/DLL && lxlite *
    226 #       -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/FreeDB && lxlite *
     224        -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/bin && lxlite *
     225        -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/DLL && lxlite *
     226        -cd ../../$(PKGNAME)-$(VERSION)-ger/CWMFldr-$(VERSION)-ger/FreeDB && lxlite *
    227227
    228228done:
    … …  
    246246        cp ./c/createcd/createcd.exe  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/
    247247        cp ./mediafolder.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.dll
    248         cp ./res/obj/mediafolder_de.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
     248        cp ./res/obj/mediafolder_en.dll ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mfldr_en.dll
    249249        cp ./help/mediafldr.hlp ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/bin/mediafld.hlp
    250250        cp ./install/MEDIAFLD.ins  ../../$(PKGNAME)-$(VERSION)-eng/CWMFldr-$(VERSION)-eng/MEDIAFLD.INS

  • trunk/todo.txt

    r2 r3  
     1Cache Information for audio shadows so mp3 tracks from CD work in media folders.
     2
    13Allow additional parameters for player and editor
    24CDFolder: Create folder script
Note: See TracChangeset for help on using the changeset viewer.