summaryrefslogtreecommitdiff
path: root/muse2/muse/arranger
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-25 18:26:02 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-25 18:26:02 +0000
commita1db21404d203bec7353099a9947778735271bfd (patch)
tree9d967018aa9d95596879d11cb651f6fa6a808bfe /muse2/muse/arranger
parent3948032d0a2e439069d9a6859f7f35eebb54944d (diff)
added step-recording support to the score editor
moved clefTypes to avoid compile-horror updated templates due to the new toolbar
Diffstat (limited to 'muse2/muse/arranger')
-rw-r--r--muse2/muse/arranger/tlist.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index b1033a2a..9e4db5ba 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -44,7 +44,6 @@
#include "midiedit/drummap.h"
#include "synth.h"
#include "config.h"
-#include "scoreedit.h"
#include "popupmenu.h"
#ifdef DSSI_SUPPORT
@@ -365,11 +364,11 @@ void TList::paint(const QRect& r)
case COL_CLEF:
if (track->isMidiTrack()) {
QString s = tr("no clef");
- if (((MidiTrack*)track)->getClef() == ScoreEdit::trebleClef)
+ if (((MidiTrack*)track)->getClef() == trebleClef)
s=tr("Treble");
- else if (((MidiTrack*)track)->getClef() == ScoreEdit::bassClef)
+ else if (((MidiTrack*)track)->getClef() == bassClef)
s=tr("Bass");
- else if (((MidiTrack*)track)->getClef() == ScoreEdit::grandStaff)
+ else if (((MidiTrack*)track)->getClef() == grandStaff)
s=tr("Grand");
p.drawText(r, Qt::AlignVCenter|Qt::AlignLeft, s);
}
@@ -1086,13 +1085,13 @@ void TList::mousePressEvent(QMouseEvent* ev)
if (act) {
switch (act->data().toInt()) {
case 0:
- ((MidiTrack*)t)->setClef(ScoreEdit::trebleClef);
+ ((MidiTrack*)t)->setClef(trebleClef);
break;
case 1:
- ((MidiTrack*)t)->setClef(ScoreEdit::bassClef);
+ ((MidiTrack*)t)->setClef(bassClef);
break;
case 2:
- ((MidiTrack*)t)->setClef(ScoreEdit::grandStaff);
+ ((MidiTrack*)t)->setClef(grandStaff);
break;
default:
break;