From 2b884b3a377827daf86c090c35745ed36bb0daca Mon Sep 17 00:00:00 2001 From: Werner Schweer Date: Wed, 21 Jun 2006 09:41:26 +0000 Subject: fixed midi channel selection flag --- muse/ChangeLog | 2 ++ muse/muse/arranger/arranger.cpp | 3 ++- muse/muse/muse.cpp | 2 +- muse/muse/part.cpp | 3 ++- muse/muse/track.cpp | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/muse/ChangeLog b/muse/ChangeLog index 6e454c86..96cce869 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,3 +1,5 @@ +21.6. (ws) + * fixed handling of midi channel selection flag 19.6. (ws) * fixed: mono plugins on stereo tracks work only on one channel * fixed drawing of cutted wave part diff --git a/muse/muse/arranger/arranger.cpp b/muse/muse/arranger/arranger.cpp index 975cdc85..bf1cb44f 100644 --- a/muse/muse/arranger/arranger.cpp +++ b/muse/muse/arranger/arranger.cpp @@ -898,6 +898,7 @@ void Arranger::startLoadSong() } (*i)->subtracks.clear(); } + _curTrack = 0; } //--------------------------------------------------------- @@ -917,7 +918,7 @@ void Arranger::endLoadSong() } } updateIndex(); - _curTrack = song->selectedTrack(); + setSelectedTrack(song->selectedTrack()); infoDock->setVisible(trackInfoVisible); mixerDock->setVisible(mixerStripVisible); } diff --git a/muse/muse/muse.cpp b/muse/muse/muse.cpp index 3656a773..f6eba4b7 100644 --- a/muse/muse/muse.cpp +++ b/muse/muse/muse.cpp @@ -1198,7 +1198,6 @@ void MusE::loadProject1(const QString& path) punchoutAction->setChecked(song->punchout()); loopAction->setChecked(song->loop()); clipboardChanged(); // enable/disable "Paste" - selectionChanged(); // enable/disable "Copy" & "Paste" song->setLen(song->len()); // emit song->lenChanged() signal // @@ -1213,6 +1212,7 @@ void MusE::loadProject1(const QString& path) tl->push_back(mc); } + selectionChanged(); // enable/disable "Copy" & "Paste" arranger->endLoadSong(); song->updatePos(); // diff --git a/muse/muse/part.cpp b/muse/muse/part.cpp index e2ead652..e556e126 100644 --- a/muse/muse/part.cpp +++ b/muse/muse/part.cpp @@ -424,7 +424,8 @@ void Part::write(Xml& xml) const xml.strTag("name", _name); PosLen::write(xml, "poslen"); - xml.intTag("selected", _selected); + if (_selected) + xml.intTag("selected", _selected); xml.intTag("color", _colorIndex); if (_raster != -1) xml.intTag("raster", _raster); diff --git a/muse/muse/track.cpp b/muse/muse/track.cpp index c8f1f20e..0b8186eb 100644 --- a/muse/muse/track.cpp +++ b/muse/muse/track.cpp @@ -244,7 +244,8 @@ void Track::writeProperties(Xml& xml) const xml.strTag("comment", _comment); if (_recordFlag) xml.intTag("record", _recordFlag); - xml.intTag("mute", mute()); + if (mute()) + xml.intTag("mute", mute()); if (solo()) xml.intTag("solo", solo()); if (off()) -- cgit v1.2.3