Add loop playback feature

musescore · Jul 31, 2013 · 3543170 · 3543170
1 parent a3b7c01
commit 3543170
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 5 deletions.
diff --git a/mscore/actions.cpp b/mscore/actions.cpp
@@ -2006,6 +2006,15 @@ Shortcut Shortcut::sc[] = {
          QT_TRANSLATE_NOOP("action","OmrPanel"),
          QT_TRANSLATE_NOOP("action","Show OMR Panel")
          ),
+      Shortcut(
+         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_PLAY | STATE_EDIT | STATE_LYRICS_EDIT,
+         0,
+         "loop",
+         QT_TRANSLATE_NOOP("action","Loop"),
+         QT_TRANSLATE_NOOP("action","Toggle loop"),
+         QT_TRANSLATE_NOOP("action","Playback will continuously restart"),
+         loop_ICON
+         ),
       Shortcut(
          STATE_NORMAL | STATE_NOTE_ENTRY | STATE_PLAY | STATE_EDIT | STATE_LYRICS_EDIT,
          0,

diff --git a/mscore/data/icons/media-playback-loop.svg b/mscore/data/icons/media-playback-loop.svg
diff --git a/mscore/data/shortcuts.xml b/mscore/data/shortcuts.xml
@@ -556,6 +556,10 @@
     <key>play</key>
     <seq>Space</seq>
     </SC>
+  <SC>
+    <key>loop</key>
+    <seq>Shift+Space</seq>
+    </SC>
   <SC>
     <key>play-prev-chord</key>
     <seq>Left</seq>

diff --git a/mscore/icons.cpp b/mscore/icons.cpp
@@ -113,6 +113,7 @@ static const char* iconNames[] = {
       "format-indent-more.svg",
       "format-indent-less.svg",
       "panel-community.svg",
+      "media-playback-loop.svg",
       "media-playback-metronome.svg",
       "vframe.svg",
       "hframe.svg",

diff --git a/mscore/icons.h b/mscore/icons.h
@@ -44,7 +44,7 @@ enum { longaUp_ICON, brevis_ICON, note_ICON, note2_ICON, note4_ICON, note8_ICON,
       hraster_ICON, vraster_ICON, repitch_ICON,
       formatListUnordered_ICON, formatListOrdered_ICON,
       formatIndentMore_ICON, formatIndentLess_ICON, community_ICON,
-      metronome_ICON,
+      loop_ICON, metronome_ICON,
       vframe_ICON, hframe_ICON, tframe_ICON, fframe_ICON, measure_ICON, checkmark_ICON,
       helpContents_ICON, goHome_ICON, goPrevious_ICON, goNext_ICON, viewRefresh_ICON,
       brackets_ICON,

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -456,6 +456,10 @@ MuseScore::MuseScore()
       vRasterAction = getAction("vraster");
       vRasterAction->setCheckable(true);
 
+      loopAction = getAction("loop");
+      loopAction->setCheckable(true);
+      loopAction->setChecked(false);
+
       metronomeAction = getAction("metronome");
       metronomeAction->setCheckable(true);
       metronomeAction->setChecked(false);
@@ -4136,6 +4140,8 @@ void MuseScore::cmd(QAction* a, const QString& cmd)
             cmdAddChordName2();
       else if (cmd == "tempo")
             addTempo();
+      else if (cmd == "loop")  // no action
+			;
       else if (cmd == "metronome")  // no action
             ;
       else if (cmd == "viewmode") {

diff --git a/mscore/musescore.h b/mscore/musescore.h
@@ -342,6 +342,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       Shortcut* lastShortcut;
 
       QAction* metronomeAction;
+      QAction* loopAction;
       QAction* panAction;
 
       QLabel* cornerLabel;
@@ -603,6 +604,7 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       NScrollArea* navigatorScrollArea() const { return _navigator; }
       void updateLayer();
       void updatePlayMode();
+      bool loop() const         	 { return loopAction->isChecked(); }
       bool metronome() const         { return metronomeAction->isChecked(); }
       bool panDuringPlayback() const { return panAction->isChecked(); }
       void noteTooShortForTupletDialog();

diff --git a/mscore/musescore.qrc b/mscore/musescore.qrc
@@ -124,6 +124,7 @@
         <file>data/icons/help-contents.svg</file>
         <file>data/icons/view-refresh.svg</file>
         <file>data/icons/align-vertical-center.svg</file>
+        <file>data/icons/media-playback-loop.svg</file>
         <file>data/icons/media-playback-metronome.svg</file>
         <file>data/icons/midi-input.svg</file>
         <file>data/icons/media-playback-pan.svg</file>

diff --git a/mscore/playpanel.cpp b/mscore/playpanel.cpp
@@ -55,6 +55,7 @@ PlayPanel::PlayPanel(QWidget* parent)
       playButton->setDefaultAction(getAction("play"));
       rewindButton->setDefaultAction(getAction("rewind"));
       metronomeButton->setDefaultAction(getAction("metronome"));
+      loopButton->setDefaultAction(getAction("loop"));
 
       connect(volumeSlider, SIGNAL(valueChanged(double,int)), SLOT(volumeChanged(double,int)));
       connect(posSlider,    SIGNAL(sliderMoved(int)),         SLOT(setPos(int)));

diff --git a/mscore/playpanel.ui b/mscore/playpanel.ui
@@ -1238,6 +1238,13 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QToolButton" name="loopButton">
+         <property name="text">
+          <string notr="true">L</string>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QToolButton" name="metronomeButton">
          <property name="text">

diff --git a/mscore/revision.h b/mscore/revision.h
@@ -1 +1 @@
-Unknown
+e47d9de
diff --git a/mscore/seq.cpp b/mscore/seq.cpp
@@ -269,6 +269,17 @@ void Seq::rewindStart()
       {
       seek(0);
       }
+
+//---------------------------------------------------------
+//   loopStart
+//---------------------------------------------------------
+
+void Seq::loopStart()
+      {
+      seek(0);
+      start();
+      qDebug("LoopStart. playPos = %d\n", playPos);
+      }
 
 //---------------------------------------------------------
 //   canStart
@@ -572,7 +583,13 @@ void Seq::process(unsigned n, float* buffer)
                   // TODO: channel?
                   putEvent(NPlayEvent(ME_CONTROLLER, 0, CTRL_SUSTAIN, 0));
                   if (playPos == events.cend())
-                        emit toGui('2');
+					    if (mscore->loop()) {
+							qDebug("MScore::Seq:: loop active. playPos = %d\n", playPos);
+							loopStart();
+							} 
+						else {
+							emit toGui('2');
+						}
                   else
                         emit toGui('0');
                   }
@@ -600,7 +617,7 @@ void Seq::process(unsigned n, float* buffer)
                   int n = f - playTime;
                   if (n < 0) {
                         qDebug("%d:  %d - %d\n", playPos->first, f, playTime);
-      			n = 0;
+						n = 0;
                         }
                   if (n) {
                         if (cs->playMode() == PLAYMODE_SYNTHESIZER) {
@@ -696,7 +713,7 @@ void Seq::process(unsigned n, float* buffer)
             peakTimer[1] = 0;
             }
       }
-
+	
 //---------------------------------------------------------
 //   initInstruments
 //---------------------------------------------------------

diff --git a/mscore/seq.h b/mscore/seq.h
@@ -162,6 +162,7 @@ class Seq : public QObject, public Sequencer {
       ~Seq();
       bool canStart();
       void rewindStart();
+      void loopStart();
       void seekEnd();
       void nextMeasure();
       void nextChord();