openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File loop_fix.diff of Package muse3 (Revision feac4a7bc2f797d7faea69f7956dc529)

Currently displaying revision feac4a7bc2f797d7faea69f7956dc529 , Show latest

--- muse3/muse/midi.cpp.orig	2015-12-28 21:22:25.000000000 +0100
+++ muse3/muse/midi.cpp	2015-12-29 10:42:39.256652352 +0100
@@ -278,36 +278,36 @@
                   continue;
             unsigned tick = ev.time();
             
-            if(doLoops)
-            {
-              if(tick >= MusEGlobal::song->lPos().tick() && tick < MusEGlobal::song->rPos().tick())
-              {
-                int loopn = ev.loopNum();
-                int loopc = MusEGlobal::audio->loopCount();
-                int cmode = MusEGlobal::song->cycleMode(); // CYCLE_NORMAL, CYCLE_MIX, CYCLE_REPLACE
-                // If we want REPLACE and the event was recorded in a previous loop, 
-                //  just ignore it. This will effectively ignore ALL previous loop events inside
-                //  the left and right markers, regardless of where recording was started or stopped.
-                // We want to keep any loop 0 note-offs from notes which crossed over the left marker. 
-                // To avoid more searching here, just keep ALL note-offs from loop 0, and let code below 
-                //  sort out and keep which ones had note-ons.
-                if(!(ev.isNoteOff() && loopn == 0))
-                {
-                  if(cmode == Song::CYCLE_REPLACE && loopn < loopc)
-                    continue;
-
-                  // If we want NORMAL, same as REPLACE except keep all events from the previous loop
-                  //  from rec stop position to right marker (and beyond).
-                  if(cmode == Song::CYCLE_NORMAL)
-                  {
-                    // Not sure of accuracy here. Adjust? Adjusted when used elsewhere?
-                    unsigned endRec = MusEGlobal::audio->getEndRecordPos().tick();
-                    if((tick < endRec && loopn < loopc) || (tick >= endRec && loopn < (loopc - 1)))
-                      continue;
-                  } 
-                }  
-              }
-            }
+//             if(doLoops)
+//             {
+//               if(tick >= MusEGlobal::song->lPos().tick() && tick < MusEGlobal::song->rPos().tick())
+//               {
+//                 int loopn = ev.loopNum();
+//                 int loopc = MusEGlobal::audio->loopCount();
+//                 int cmode = MusEGlobal::song->cycleMode(); // CYCLE_NORMAL, CYCLE_MIX, CYCLE_REPLACE
+//                 // If we want REPLACE and the event was recorded in a previous loop, 
+//                 //  just ignore it. This will effectively ignore ALL previous loop events inside
+//                 //  the left and right markers, regardless of where recording was started or stopped.
+//                 // We want to keep any loop 0 note-offs from notes which crossed over the left marker. 
+//                 // To avoid more searching here, just keep ALL note-offs from loop 0, and let code below 
+//                 //  sort out and keep which ones had note-ons.
+//                 if(!(ev.isNoteOff() && loopn == 0))
+//                 {
+//                   if(cmode == Song::CYCLE_REPLACE && loopn < loopc)
+//                     continue;
+// 
+//                   // If we want NORMAL, same as REPLACE except keep all events from the previous loop
+//                   //  from rec stop position to right marker (and beyond).
+//                   if(cmode == Song::CYCLE_NORMAL)
+//                   {
+//                     // Not sure of accuracy here. Adjust? Adjusted when used elsewhere?
+//                     unsigned endRec = MusEGlobal::audio->getEndRecordPos().tick();
+//                     if((tick < endRec && loopn < loopc) || (tick >= endRec && loopn < (loopc - 1)))
+//                       continue;
+//                   } 
+//                 }  
+//               }
+//             }
             
             Event e;
             switch(ev.type()) {

Places

File loop_fix.diff of Package muse3 (Revision feac4a7bc2f797d7faea69f7956dc529)

Places