DivSongTimestamps, part 8

now remove walkSong()

src/engine/cmdStreamOps.cpp

@@ -1252,10 +1252,9 @@ SafeWriter* DivEngine::saveCommand(DivCSProgress* progress, DivCSOptions options
   setOrder(0);
   BUSY_BEGIN_SOFT;
   // determine loop point
-  int loopOrder=0;
-  int loopRow=0;
-  int loopEnd=0;
-  walkSong(loopOrder,loopRow,loopEnd);
+  calcSongTimestamps();
+  int loopOrder=curSubSong->ts.loopStart.order;
+  int loopRow=curSubSong->ts.loopStart.row;
   logI("loop point: %d %d",loopOrder,loopRow);
 
   int cmdPopularity[256];

src/engine/engine.cpp

@@ -201,15 +201,6 @@ const char* DivEngine::getEffectDesc(unsigned char effect, int chan, bool notNul
   return notNull?_("Invalid effect"):NULL;
 }
 
-void DivEngine::walkSong(int& loopOrder, int& loopRow, int& loopEnd) {
-  if (curSubSong!=NULL) {
-    curSubSong->calcTimestamps(chans,song.grooves,song.jumpTreatment,song.ignoreJumpAtEnd,song.brokenSpeedSel,song.delayBehavior);
-    loopOrder=curSubSong->ts.loopStart.order;
-    loopRow=curSubSong->ts.loopStart.row;
-    loopEnd=curSubSong->ts.loopEnd.order;
-  }
-}
-
 void DivEngine::calcSongTimestamps() {
   if (curSubSong!=NULL) {
     curSubSong->calcTimestamps(chans,song.grooves,song.jumpTreatment,song.ignoreJumpAtEnd,song.brokenSpeedSel,song.delayBehavior);

src/engine/engine.h

@@ -870,9 +870,6 @@ class DivEngine {
     int convertPanSplitToLinearLR(unsigned char left, unsigned char right, int range);
     unsigned int convertPanLinearToSplit(int val, unsigned char bits, int range);
 
-    // DEPRECATED - find song loop position
-    void walkSong(int& loopOrder, int& loopRow, int& loopEnd);
-
     // calculate all song timestamps
     void calcSongTimestamps();
 

src/engine/export/amigaValidation.cpp

@@ -55,10 +55,9 @@ void DivExportAmigaValidation::run() {
   EXTERN_BUSY_BEGIN_SOFT;
 
   // determine loop point
-  int loopOrder=0;
-  int loopRow=0;
-  int loopEnd=0;
-  e->walkSong(loopOrder,loopRow,loopEnd);
+  e->calcSongTimestamps();
+  int loopOrder=e->curSubSong->ts.loopStart.order;
+  int loopRow=e->curSubSong->ts.loopStart.row;
 
   e->curOrder=0;
   e->freelance=false;

src/engine/export/grub.cpp

@@ -76,10 +76,9 @@ void DivExportGRUB::run() {
     e->got.rate=rate;
 
     // Determine loop point.
-    int loopOrder=0;
-    int loopRow=0;
-    int loopEnd=0;
-    e->walkSong(loopOrder,loopRow,loopEnd);
+    e->calcSongTimestamps();
+    int loopOrder=e->curSubSong->ts.loopStart.order;
+    int loopRow=e->curSubSong->ts.loopStart.row;
     logAppendf("loop point: %d %d",loopOrder,loopRow);
     e->warnings="";
 

src/engine/export/ipod.cpp

@@ -75,10 +75,9 @@ void DivExportiPod::run() {
     e->got.rate=rate;
 
     // Determine loop point.
-    int loopOrder=0;
-    int loopRow=0;
-    int loopEnd=0;
-    e->walkSong(loopOrder,loopRow,loopEnd);
+    e->calcSongTimestamps();
+    int loopOrder=e->curSubSong->ts.loopStart.order;
+    int loopRow=e->curSubSong->ts.loopStart.row;
     logAppendf("loop point: %d %d",loopOrder,loopRow);
     e->warnings="";
 

src/engine/export/sapr.cpp

@@ -92,10 +92,9 @@ void DivExportSAPR::run() {
     e->got.rate=sapRate;
 
     // Determine loop point.
-    int loopOrder=0;
-    int loopRow=0;
-    int loopEnd=0;
-    e->walkSong(loopOrder,loopRow,loopEnd);
+    e->calcSongTimestamps();
+    int loopOrder=e->curSubSong->ts.loopStart.order;
+    int loopRow=e->curSubSong->ts.loopStart.row;
     logAppendf("loop point: %d %d",loopOrder,loopRow);
     e->warnings="";
 

src/engine/export/tiuna.cpp

@@ -181,7 +181,7 @@ static void writeCmd(std::vector<TiunaBytes>& cmds, TiunaCmd& cmd, unsigned char
 }
 
 void DivExportTiuna::run() {
-  int loopOrder, loopOrderRow, loopEnd;
+  int loopOrder, loopOrderRow;
   int tick=0;
   SafeWriter* w;
   std::map<int,TiunaCmd> allCmds[2];
@@ -199,10 +199,9 @@ void DivExportTiuna::run() {
   e->synchronizedSoft([&]() {
     // determine loop point
     // bool stopped=false;
-    loopOrder=0;
-    loopOrderRow=0;
-    loopEnd=0;
-    e->walkSong(loopOrder,loopOrderRow,loopEnd);
+    e->calcSongTimestamps();
+    loopOrder=e->curSubSong->ts.loopStart.order;
+    loopOrderRow=e->curSubSong->ts.loopStart.row;
     logAppendf("loop point: %d %d",loopOrder,loopOrderRow);
 
     w=new SafeWriter;

src/engine/export/zsm.cpp

@@ -574,10 +574,9 @@ void DivExportZSM::run() {
     e->got.rate=zsmrate&0xffff;
 
     // determine loop point
-    int loopOrder=0;
-    int loopRow=0;
-    int loopEnd=0;
-    e->walkSong(loopOrder,loopRow,loopEnd);
+    e->calcSongTimestamps();
+    int loopOrder=e->curSubSong->ts.loopStart.order;
+    int loopRow=e->curSubSong->ts.loopStart.row;
     logAppendf("loop point: %d %d",loopOrder,loopRow);
 
     zsm.init(zsmrate);

src/engine/vgmOps.cpp

@@ -1272,10 +1272,9 @@ SafeWriter* DivEngine::saveVGM(bool* sysToExport, bool loop, int version, bool p
   double origRate=got.rate;
   got.rate=correctedRate;
   // determine loop point
-  int loopOrder=0;
-  int loopRow=0;
-  int loopEnd=0;
-  walkSong(loopOrder,loopRow,loopEnd);
+  calcSongTimestamps();
+  int loopOrder=curSubSong->ts.loopStart.order;
+  int loopRow=curSubSong->ts.loopStart.row;
   logI("loop point: %d %d",loopOrder,loopRow);
   warnings="";