summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-10-11 14:06:30 +0000
committerFlorian Jung <flo@windfisch.org>2011-10-11 14:06:30 +0000
commit88041047222b78104191f449d3dbd7953d78a6e4 (patch)
tree3a9587cdd5f5bb790b9aa5eb0aef011077b33014
parent3dd4d0393c2824e98022d921667826a568843a7c (diff)
some testing and crash-fixes
-rw-r--r--muse2/muse/arranger/arrangerview.cpp4
-rw-r--r--muse2/muse/arranger/pcanvas.cpp7
-rw-r--r--muse2/muse/arranger/tlist.cpp11
-rw-r--r--muse2/muse/midi.cpp2
-rw-r--r--muse2/muse/track.cpp3
5 files changed, 12 insertions, 15 deletions
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index a565da13..51fc3bb0 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -146,9 +146,9 @@ ArrangerView::ArrangerView(QWidget* parent)
editInsertEMAction = new QAction(QIcon(*editpasteIconSet), tr("&Insert Empty Measure"), this);
editDeleteSelectedAction = new QAction(QIcon(*edit_track_delIcon), tr("Delete Selected Tracks"), this);
- editShrinkPartsAction = new QAction(tr("Shrink selected parts"), this); //FINDMICH TODO tooltips!
+ editShrinkPartsAction = new QAction(tr("Shrink selected parts"), this);
editExpandPartsAction = new QAction(tr("Expand selected parts"), this);
- editCleanPartsAction = new QAction(tr("Clean selected parts"), this);
+ editCleanPartsAction = new QAction(tr("Purge hidden events from selected parts"), this);
addTrack = new QMenu(tr("Add Track"), this);
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 8226c440..987a7e9a 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -392,13 +392,13 @@ MusECore::UndoOp PartCanvas::moveItem(CItem* item, const QPoint& newpos, DragTyp
if (t == MOVE_COPY || t == MOVE_CLONE) {
// These will not increment ref count, and will not chain clones...
- // TODO FINDMICH: is this still correct (by flo93)? i doubt it!
+ // TODO: is comment this still correct (by flo93)? i doubt it!
result=MusECore::UndoOp(MusECore::UndoOp::AddPart,dpart);
}
else if (t == MOVE_MOVE) {
dpart->setSelected(spart->selected());
// These will increment ref count if not a clone, and will chain clones...
- // TODO FINDMICH: is this still correct (by flo93)? i doubt it!
+ // TODO: is this comment still correct (by flo93)? i doubt it!
result=MusECore::UndoOp(MusECore::UndoOp::ModifyPart,spart, dpart, true, false);
spart->setSelected(false);
@@ -854,9 +854,6 @@ void PartCanvas::mousePress(QMouseEvent* event)
QPoint pt = event->pos();
CItem* item = items.find(pt);
- //if (item == 0 && _tool!=AutomationTool) // FINDMICHJETZT. neccessary? (flo93)
- // return;
-
switch (_tool) {
default:
if (item)
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);
}
}
diff --git a/muse2/muse/midi.cpp b/muse2/muse/midi.cpp
index 52d6e4f8..28269b20 100644
--- a/muse2/muse/midi.cpp
+++ b/muse2/muse/midi.cpp
@@ -991,7 +991,7 @@ void Audio::processMidi()
event.setA(MusEGlobal::drumMap[(unsigned int)MusEGlobal::drumInmap[pitch]].anote);
event.setChannel(channel);
}
- else if (track->type() == Track::NEW_DRUM) //FINDMICH DOES THAT WORK?
+ else if (track->type() == Track::NEW_DRUM)
{
event.setA(track->map_drum_in(event.dataA()));
diff --git a/muse2/muse/track.cpp b/muse2/muse/track.cpp
index 2df8a718..31504309 100644
--- a/muse2/muse/track.cpp
+++ b/muse2/muse/track.cpp
@@ -244,8 +244,7 @@ Track::Track(const Track& t, bool cloneParts)
// A couple of schemes were conceived to deal with cloneList being invalid, but the best way is
// to not alter the part list here. It's a big headache because: Either the parts in the cloneList
// need to be reliably looked up replaced with the new ones, or the clipboard and cloneList must be cleared.
- // Fortunately the ONLY parts of muse using this function are track rename (in TrackList and TrackInfo) and
- // changing track type from MIDI to NEW_DRUM or vice versa (NOT something -> DRUM or vice versa).
+ // Fortunately the ONLY part of muse using this function is track rename (in TrackList and TrackInfo).
// So we can get away with leaving this out:
//for (iPart ip = _parts.begin(); ip != _parts.end(); ++ip)
// ip->second->setTrack(this);