merged with release_2_0

1 files changed, 15 insertions, 7 deletions

diff --git a/muse2/muse/midiseq.cpp b/muse2/muse/midiseq.cpp
index 94335d99..1000cc46 100644
--- a/muse2/muse/midiseq.cpp
+++ b/muse2/muse/midiseq.cpp
@@ -486,18 +486,26 @@ void MidiSeq::start(int priority)
       prio = priority;
       
       MusEGlobal::doSetuid();
-      int gotTicks = setRtcTicks();
+      setRtcTicks();
       MusEGlobal::undoSetuid();
       Thread::start(priority);
-
-      if (gotTicks < 500) {
-          QMessageBox::warning( MusEGlobal::muse, QString("Bad timing"), QString("Timing source has a frequency below 500hz!\n" \
-                                          "This could lead to audible timing problems.\n" \
-                                          "Please see console output for any further error messages\n "));
-          }
       }
 
 //---------------------------------------------------------
+//   checkAndReportTimingResolution
+//---------------------------------------------------------
+void MidiSeq::checkAndReportTimingResolution()
+{
+    int freq = timer->getTimerFreq();
+    if (freq < 500) {
+        QMessageBox::warning( MusEGlobal::muse, QString("Bad timing"), QString("Timing source frequency is %1hz, which is below the recommended minimum: 500hz!\n" \
+                                        "This could lead to audible timing problems for MIDI.\n" \
+                                        "Please see the FAQ on http://muse-sequencer.org for remedies.\n" \
+                                        "Also please check console output for any further error messages\n ").arg(freq));
+    }
+}
+
+//---------------------------------------------------------
 //   processMidiClock
 //---------------------------------------------------------