Changeset 4 for trunk/mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp

Timestamp:

Jul 13, 2017, 5:17:57 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-0_2_9-work-01_10_2006.zip dated 2006-08-27

File:

• trunk/mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp (modified) (9 diffs)

trunk/mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 2002-2003
+ * This file is (C) Chris Wohlgemuth 2002-2005
  * 
  * It's part of the Media-Folder distribution
@@ -57 +57 @@
 extern void showPlayTimeDisplay(CWMediaFolder *thisPtr, BOOL bShow);
 void setPlayTimeText2(CWMediaFolder *thisPtr, char * theText);
-void HlpWriteToTrapLog(const char* chrFormat, ...);
+
 /* Get the HWND of the play control dialog. This Dialog is on top of
    the top frame control. */
@@ -344 +344 @@
     }
   case PLAY_NEXT:
+  case PLAY_NEXT_CDFLDR:
     if(iWave==0)
       return cwPlayAudioFile(hwndFrame, PLAY_FIRST);/* Not yet playing */
@@ -450 +451 @@
   }/* switch */
 
-  if(!getMessage(chrCommand, IDSTR_STARTINGTRACK, sizeof(chrCommand), queryResModuleHandle(),  hwndFrame))
-    sprintf(chrCommand, "Starting track...");
-  setPlayTimeText2(this, chrCommand);
+  //  if(ulWhich!=PLAY_NEXT_CDFLDR) {
+    if(!getMessage(chrCommand, IDSTR_STARTINGTRACK, sizeof(chrCommand), queryResModuleHandle(),  hwndFrame))
+      sprintf(chrCommand, "Starting track...");
+    setPlayTimeText2(this, chrCommand);
+    // }
 
   strncpy(chrDevice,"CDAUDIO", sizeof(chrDevice));
@@ -519 +522 @@
   }/*   if( ...|| !mrcPlaying) */
 
-  if(iPrevTrack+1==iTime2) {
+  if(iPrevTrack+1==iTime2 && ulWhich!=PLAY_NEXT_CDFLDR) {
     /* Previous track ended, now playing the next. Or user pressed 'Next' while playing */
     if(ulPos*1000 < ulTotalLength) {
@@ -539 +542 @@
         return 0;
       }
-      //  HlpWriteToTrapLog("\n2\n");
-    }
-  }
-
-  //  HlpWriteToTrapLog("About to get length...\n");
+    }
+  }
 
   /* Get length in ms */
@@ -552 +552 @@
   }
 
-  // HlpWriteToTrapLog("iTime2: %d\n", iTime2);
-
   sprintf(chrCommand,"%d:%02d  %d:%02d  -%d:%02d", iTime2/60, iTime2%60,
           0, 0,
           iTime2/60, iTime2%60);
 
-  //  HlpWriteToTrapLog("chrCommand: %s\n", chrCommand);
   
   //  WinSetWindowText(WinWindowFromID(hwndTop, IDST_PLAYTIME), chrCommand);
@@ -658 +655 @@
   int iCurrentTrack;
 
+  //SysWriteToTrapLog("\n%s:\n", __FUNCTION__);
+
   sprintf(chrCommand,"STATUS wave%d MODE WAIT", iWave);
   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
@@ -688 +687 @@
   else {
     iCurrentTrack=atoi(retMsg);
+    //SysWriteToTrapLog(" iWave: %d. iPrevTrack: %d, iCurrentrack: %d\n", iWave, iPrevTrack, iCurrentTrack);
     /* Timeout. Check if track is still playing */
     if(iCurrentTrack==iPrevTrack+1) {
       /* Audio file played. Start next */
-      cwPlayAudioFile(hwndFrame, PLAY_NEXT); 
-    }
-  }
-}
-
-
-
-
-
-
-
-
-
+      //SysWriteToTrapLog(" iWave: %d. iPrevTrack: %d, iCurrentrack: %d, startinb next (%d)\n", iWave, iPrevTrack, iCurrentTrack, __LINE__);
+      cwPlayAudioFile(hwndFrame, PLAY_NEXT_CDFLDR); 
+    }
+  }
+}
+
+
+