diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2011-04-23 23:44:22 +0000 | 
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2011-04-23 23:44:22 +0000 | 
| commit | efac864c25429cdb853fba82484606f94fb6d4ec (patch) | |
| tree | 2025f80649f616bf3cff93926535d20531c41b0b /muse2/muse | |
| parent | 593be37c193d860113867c5aae0c3b241bc73528 (diff) | |
don't warn samplerate for dummy audio
Diffstat (limited to 'muse2/muse')
| -rw-r--r-- | muse2/muse/songfile.cpp | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp index 7a690f74..3841a204 100644 --- a/muse2/muse/songfile.cpp +++ b/muse2/muse/songfile.cpp @@ -33,7 +33,7 @@  #include "wave.h"  #include "midictrl.h"  #include "amixer.h" -//#include "mixer/amixer.h"              // p4.0.2 +#include "audiodev.h"  #include "conf.h"  #include "driver/jackmidi.h"  #include "keyevent.h" @@ -1250,7 +1250,7 @@ void Song::read(Xml& xml)                                _follow  = FollowMode(xml.parseInt());                          else if (tag == "sampleRate") {                                int sRate  = xml.parseInt(); -                              if (sRate != sampleRate) +                              if (audioDevice->deviceType() != AudioDevice::DUMMY_AUDIO && sRate != sampleRate)                                  QMessageBox::warning(muse,"Wrong sample rate", "The sample rate in this project and the current system setting differs, the project may not work as intended!");                              }                          else if (tag == "tempolist") { | 
