fix pulseaudio integration

musescore · May 30, 2012 · c849f7a · c849f7a
1 parent 4b4c75d
commit c849f7a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 71 deletions.
diff --git a/mscore/mopss b/mscore/mopss
diff --git a/mscore/preferences.cpp b/mscore/preferences.cpp
@@ -133,9 +133,9 @@ void Preferences::init()
 #else
       useAlsaAudio       = false;
       useJackAudio       = false;
-      usePortaudioAudio  = true;
-      useJackMidi        = false;
+      usePortaudioAudio  = false;
       usePulseAudio      = true;
+      useJackMidi        = false;
 #endif
 
       midiPorts          = 2;

diff --git a/mscore/waveview.cpp b/mscore/waveview.cpp
@@ -118,8 +118,8 @@ void WaveView::setAudio(Audio* audio)
       int rn = 0;
       const int n = 10000 / WSCALE;
       uchar dst[n];
-      float* r;
-      float* l;
+      float* r = 0;
+      float* l = 0;
       for (;;) {
             for (int i = 0; i < n; ++i) {
                   float val = 0;

diff --git a/msynth/synti.cpp b/msynth/synti.cpp
@@ -64,18 +64,16 @@ MasterSynth::~MasterSynth()
 
 void MasterSynth::init(int sampleRate)
       {
-      bool useJackFlag      = preferences.useJackAudio || preferences.useJackMidi;
-      bool useAlsaFlag      = preferences.useAlsaAudio;
-      bool usePortaudioFlag = preferences.usePortaudioAudio;
-
-      if (useJackFlag || useAlsaFlag || usePortaudioFlag) {
+      if (preferences.useJackAudio
+         || preferences.useJackMidi
+         || preferences.useAlsaAudio
+         || preferences.usePortaudioAudio
+         || preferences.usePulseAudio) {
             syntis.append(new FluidS::Fluid());
 #ifdef AEOLUS
             syntis.append(new Aeolus());
 #endif
             }
-      if (syntis.isEmpty())
-            return;
       foreach(Synth* s, syntis)
             s->init(sampleRate);
       foreach(Synth* s, syntis) {