From a9cef6554f73892b6c7ff6a7a44d8e72f06aa16f Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Sun, 25 Nov 2012 22:31:33 +0000 Subject: Speaker on --- muse2/ChangeLog | 2 ++ muse2/muse/midiedit/drumedit.cpp | 3 ++- muse2/muse/midiedit/ecanvas.cpp | 2 +- muse2/muse/midiedit/pianoroll.cpp | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 90d3258f..c14b9d7f 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,5 @@ +25.11.2012: + - Changed playback of midi in editors to default to on (rj) 21.11.2012: * Fixed: Markers and synth windows don't open at all on some desktops like Lubuntu. (Tim) Solution was combination of REMOVAL of fix for "bug: 2811156 Softsynth GUI unclosable..." diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp index 2ff9448d..08c5bec7 100644 --- a/muse2/muse/midiedit/drumedit.cpp +++ b/muse2/muse/midiedit/drumedit.cpp @@ -168,7 +168,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un lastSelections = 0; split1w1 = 0; //selPart = 0; - _playEvents = false; + _playEvents = true; QSignalMapper *signalMapper = new QSignalMapper(this); _group_mode = GROUP_SAME_CHANNEL; @@ -426,6 +426,7 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un speaker->setToolTip(tr("Play Events")); speaker->setIcon(*speakerIcon); speaker->setCheckable(true); + speaker->setChecked(true); speaker->setFocusPolicy(Qt::NoFocus); tools->addWidget(speaker); diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp index 9b51c653..c1185688 100644 --- a/muse2/muse/midiedit/ecanvas.cpp +++ b/muse2/muse/midiedit/ecanvas.cpp @@ -57,7 +57,7 @@ EventCanvas::EventCanvas(MidiEditor* pr, QWidget* parent, int sx, editor = pr; _steprec = false; _midiin = false; - _playEvents = false; + _playEvents = true; _setCurPartIfOnlyOneEventIsSelected = true; curVelo = 70; diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp index 0698f5ad..14e1ce73 100644 --- a/muse2/muse/midiedit/pianoroll.cpp +++ b/muse2/muse/midiedit/pianoroll.cpp @@ -104,7 +104,7 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name, veloOnOffset = 0; veloOffOffset = 0; lastSelections = 0; - _playEvents = false; + _playEvents = true; colorMode = colorModeInit; QSignalMapper* mapper = new QSignalMapper(this); @@ -293,6 +293,7 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name, speaker->setToolTip(tr("Play Events")); speaker->setIcon(*speakerIcon); speaker->setCheckable(true); + speaker->setChecked(true); speaker->setFocusPolicy(Qt::NoFocus); tools->addWidget(speaker); -- cgit v1.2.3