summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/muse/midiedit')
-rw-r--r--muse2/muse/midiedit/dcanvas.cpp10
-rw-r--r--muse2/muse/midiedit/drumedit.cpp4
-rw-r--r--muse2/muse/midiedit/ecanvas.cpp1
-rw-r--r--muse2/muse/midiedit/pianoroll.cpp4
4 files changed, 4 insertions, 15 deletions
diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index ff30eb64..734871ef 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -1003,18 +1003,8 @@ void DrumCanvas::keyReleased(int, bool)
{
// release note:
if(_playEvents)
- {
- // REMOVE Tim.
- //int pitch, port, channel;
- //if(index2Note(index, &port, &channel, &pitch))
- //{
- // MusECore::MidiPlayEvent e(0, port, channel, 0x90, pitch, 0);
- // MusEGlobal::audio->msgPlayMidiEvent(&e);
- //}
stopPlayEvent();
}
- //playedPitch=-1;
- }
//---------------------------------------------------------
// mapChanged
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 3ddf6f7b..e2ba0ef1 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -986,10 +986,10 @@ void DrumEdit::writeStatus(int level, MusECore::Xml& xml) const
xml.intTag(level, "midiin", canvas->midiin());
xml.intTag(level, "tool", int(canvas->tool()));
xml.intTag(level, "playEvents", _playEvents);
- xml.intTag(level, "xpos", hscroll->pos());
xml.intTag(level, "xmag", hscroll->mag());
- xml.intTag(level, "ypos", vscroll->pos());
+ xml.intTag(level, "xpos", hscroll->pos());
xml.intTag(level, "ymag", vscroll->mag());
+ xml.intTag(level, "ypos", vscroll->pos());
xml.intTag(level, "ignore_hide", _ignore_hide);
xml.tag(level, "/drumedit");
}
diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp
index 492727cb..4ae702f1 100644
--- a/muse2/muse/midiedit/ecanvas.cpp
+++ b/muse2/muse/midiedit/ecanvas.cpp
@@ -527,7 +527,6 @@ void EventCanvas::stopPlayEvent()
if(playedPitch == -1 || playedPitchPort == -1 || playedPitchChannel == -1)
return;
// release note:
- //MusECore::MidiPlayEvent ev(0, playedPitchPort, playedPitchChannel, 0x90, playedPitch, 0); // REMOVE Tim.
MusECore::MidiPlayEvent ev(0, playedPitchPort, playedPitchChannel, MusECore::ME_NOTEOFF, playedPitch, playedVelocity);
MusEGlobal::audio->msgPlayMidiEvent(&ev);
playedPitch = playedPitchPort = playedPitchChannel = -1;
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 66e6c2fb..d0cb3f2a 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -1067,10 +1067,10 @@ void PianoRoll::writeStatus(int level, MusECore::Xml& xml) const
xml.intTag(level, "midiin", canvas->midiin());
xml.intTag(level, "tool", int(canvas->tool()));
xml.intTag(level, "playEvents", _playEvents);
- xml.intTag(level, "xpos", hscroll->pos());
xml.intTag(level, "xmag", hscroll->mag());
- xml.intTag(level, "ypos", vscroll->pos());
+ xml.intTag(level, "xpos", hscroll->pos());
xml.intTag(level, "ymag", vscroll->mag());
+ xml.intTag(level, "ypos", vscroll->pos());
xml.tag(level, "/pianoroll");
}