change app name from MuseScoreDevelopment to MuseScore3Development

musescore · Aug 7, 2018 · 215cdd8 · 215cdd8
1 parent 2b9e6a8
commit 215cdd8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/mscore/alsa.cpp b/mscore/alsa.cpp
@@ -258,11 +258,15 @@ int AlsaDriver::playInit(snd_pcm_uframes_t len)
 
 void AlsaDriver::printinfo()
       {
-      qDebug("\n  nchan  : %d", _play_nchan);
+      qDebug("Info:");
+      qDebug("  nchan  : %d", _play_nchan);
       qDebug("  rate   : %d", _rate);
       qDebug("  frsize : %ld", _frsize);
       qDebug("  nfrags : %d", _nfrags);
-      qDebug("  format : %s", snd_pcm_format_name (_play_format));
+
+      snd_pcm_format_t format;
+      snd_pcm_hw_params_get_format (_play_hwpar, &format);
+      qDebug("  format : %s", snd_pcm_format_name (format));
       }
 
 //---------------------------------------------------------
@@ -342,7 +346,8 @@ bool AlsaDriver::setHwpar(snd_pcm_t* handle, snd_pcm_hw_params_t* hwpar)
             }
 
       if ((err = snd_pcm_hw_params (handle, hwpar)) < 0) {
-            qDebug("Alsa_driver: can't set hardware parameters.");
+            qDebug("Alsa_driver: can't set hardware parameters: %s", snd_strerror(err));
+            printinfo();
             return false;
             }
       return true;

diff --git a/mscore/jackaudio.cpp b/mscore/jackaudio.cpp
@@ -22,7 +22,7 @@
 // Include stdint.h and #define _STDINT_H to prevent <systemdeps.h> from redefining types
 // #undef UNICODE to force LoadLibrary to use the char-based implementation instead of the wchar_t one.
 #include <stdint.h>
-#define _STDINT_H 1  
+#define _STDINT_H 1
 #endif
 
 #include "jackaudio.h"

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -3839,7 +3839,6 @@ void MuseScore::writeSettings()
             mixer->writeSettings();
       settings.setValue("mixerVisible", mixer && mixer->isVisible());
       if (seq) {
-            seq->stopWait();
             seq->exit();
             }
       if (instrList)
@@ -6354,7 +6353,7 @@ int main(int argc, char* av[])
       const char* appName2;
       if (MuseScore::unstable()) {
             appName2 = "mscore-dev3";
-            appName  = "MuseScoreDevelopment";
+            appName  = "MuseScore3Development";
             }
       else {
             appName2 = "mscore3";

diff --git a/mscore/pulseaudio.cpp b/mscore/pulseaudio.cpp
@@ -173,8 +173,9 @@ void* PulseAudio::paLoop(void* data)
       {
       PulseAudio* pa = (PulseAudio*)data;
       pa->runState = 2;
-      while (pa->runState == 2)
+      while (pa->runState == 2) {
             pa_mainloop_iterate(pa->pa_ml, 1, NULL);
+            }
       pa->runState = 0;
       return 0;
       }

diff --git a/mscore/seq.cpp b/mscore/seq.cpp
@@ -357,7 +357,6 @@ void Seq::stop()
       if (cv)
             cv->setCursorOn(false);
       if (cs) {
-//??            cs->setLayoutAll();
             cs->setUpdateAll();
             cs->update();
             }
@@ -1555,7 +1554,7 @@ double Seq::curTempo() const
       {
       if (playPos != events.end())
             return cs ? cs->tempomap()->tempo(playPos->first) : 0.0;
-      
+
       return 0.0;
       }