diff options
| author | Florian Jung <flo@windfisch.org> | 2011-10-11 14:06:30 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-10-11 14:06:30 +0000 |
| commit | 88041047222b78104191f449d3dbd7953d78a6e4 (patch) | |
| tree | 3a9587cdd5f5bb790b9aa5eb0aef011077b33014 /muse2/muse/arranger/tlist.cpp | |
| parent | 3dd4d0393c2824e98022d921667826a568843a7c (diff) | |
some testing and crash-fixes
Diffstat (limited to 'muse2/muse/arranger/tlist.cpp')
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 1b2358f3..c209ba9c 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -1888,7 +1888,7 @@ void TList::classesPopupMenu(MusECore::Track* t, int x, int y) return; int n = act->data().toInt(); - if ((MusECore::Track::TrackType(n) == MusECore::Track::MIDI || MusECore::Track::TrackType(n) == MusECore::Track::NEW_DRUM) && t->type() == MusECore::Track::DRUM) { //FINDMICHJETZT passt das? + if ((MusECore::Track::TrackType(n) == MusECore::Track::MIDI || MusECore::Track::TrackType(n) == MusECore::Track::NEW_DRUM) && t->type() == MusECore::Track::DRUM) { // // Drum -> Midi // @@ -1926,7 +1926,7 @@ void TList::classesPopupMenu(MusECore::Track* t, int x, int y) MusEGlobal::audio->msgIdle(false); MusEGlobal::song->update(SC_EVENT_MODIFIED); } - else if (MusECore::Track::TrackType(n) == MusECore::Track::DRUM && (t->type() == MusECore::Track::MIDI || t->type() == MusECore::Track::NEW_DRUM)) { //FINDMICHJETZT passt das? + else if (MusECore::Track::TrackType(n) == MusECore::Track::DRUM && (t->type() == MusECore::Track::MIDI || t->type() == MusECore::Track::NEW_DRUM)) { // // Midi -> Drum // @@ -1984,11 +1984,12 @@ void TList::classesPopupMenu(MusECore::Track* t, int x, int y) MusEGlobal::audio->msgIdle(false); MusEGlobal::song->update(SC_EVENT_MODIFIED); } - else // MIDI -> NEW_DRUM or vice versa. added by flo. FINDMICHJETZT does this work properly? + else // MIDI -> NEW_DRUM or vice versa. added by flo. { - MusECore::Track* t2 = t->clone(false); + MusEGlobal::audio->msgIdle(true); t->setType(MusECore::Track::TrackType(n)); - MusEGlobal::audio->msgChangeTrack(t2, t, true); + MusEGlobal::audio->msgIdle(false); + MusEGlobal::song->update(SC_TRACK_MODIFIED); } } |