diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2011-05-24 18:31:42 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2011-05-24 18:31:42 +0000 |
| commit | 9e3802aadd279ffd0a677df9dd5d21e02315d8b4 (patch) | |
| tree | c37f010624dee5e463a1d301335bc10d5c764ea4 /muse2/muse/songfile.cpp | |
| parent | 9defbf3c671ccb70ff4b29f222ea9fb9227099b2 (diff) | |
template sample rate, drum track channel, track list header
Diffstat (limited to 'muse2/muse/songfile.cpp')
| -rw-r--r-- | muse2/muse/songfile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp index a8134b1d..72cacfaa 100644 --- a/muse2/muse/songfile.cpp +++ b/muse2/muse/songfile.cpp @@ -1213,7 +1213,7 @@ void Song::readMarker(Xml& xml) // read //--------------------------------------------------------- -void Song::read(Xml& xml) +void Song::read(Xml& xml, bool isTemplate) { cloneList.clear(); for (;;) { @@ -1260,7 +1260,7 @@ void Song::read(Xml& xml) _follow = FollowMode(xml.parseInt()); else if (tag == "sampleRate") { int sRate = xml.parseInt(); - if (audioDevice->deviceType() != AudioDevice::DUMMY_AUDIO && sRate != sampleRate) + if (!isTemplate && 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") { @@ -1373,7 +1373,7 @@ void Song::read(Xml& xml) // read song //--------------------------------------------------------- -void MusE::read(Xml& xml, bool skipConfig) +void MusE::read(Xml& xml, bool skipConfig, bool isTemplate) { bool skipmode = true; for (;;) { @@ -1398,7 +1398,7 @@ void MusE::read(Xml& xml, bool skipConfig) readConfiguration(xml, false); else if (tag == "song") { - song->read(xml); + song->read(xml, isTemplate); audio->msgUpdateSoloStates(); } else if (tag == "midiport") |