diff options
author | Tim E. Real <termtech@rogers.com> | 2013-05-08 08:52:52 +0000 |
---|---|---|
committer | Tim E. Real <termtech@rogers.com> | 2013-05-08 08:52:52 +0000 |
commit | 2c1f2f49d2ac878c13f9c59d86166a62bbd7573d (patch) | |
tree | 96bb20b3f43823fa51cf49cfa25fae49f73882ce /muse2/muse/widgets | |
parent | 8a491e19e6520f2680bf51aec1ca7e2070ccaec7 (diff) |
Yet another MAJOR audio engine and plugin/synth process chain re-write.
And much more, see ChangeLog, May 8 2013.
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r-- | muse2/muse/widgets/scrollscale.cpp | 1 | ||||
-rw-r--r-- | muse2/muse/widgets/sliderbase.cpp | 24 | ||||
-rw-r--r-- | muse2/muse/widgets/tracks_duplicate_base.ui | 5 | ||||
-rw-r--r-- | muse2/muse/widgets/vst_native_editor.cpp | 2 |
4 files changed, 15 insertions, 17 deletions
diff --git a/muse2/muse/widgets/scrollscale.cpp b/muse2/muse/widgets/scrollscale.cpp index fcf36e1b..5664bfc2 100644 --- a/muse2/muse/widgets/scrollscale.cpp +++ b/muse2/muse/widgets/scrollscale.cpp @@ -198,7 +198,6 @@ void ScrollScale::setRange ( int min, int max ) void ScrollScale::setPos ( unsigned pos ) { - scroll->setValue ( pos ); } diff --git a/muse2/muse/widgets/sliderbase.cpp b/muse2/muse/widgets/sliderbase.cpp index 5909c64d..3dfbfa40 100644 --- a/muse2/muse/widgets/sliderbase.cpp +++ b/muse2/muse/widgets/sliderbase.cpp @@ -386,17 +386,19 @@ void SliderBase::mouseMoveEvent(QMouseEvent *e) double ms = 0.0; if (d_scrollMode == ScrMouse ) { - setPosition(e->pos()); - if (d_mass > 0.0) - { - ms = double(d_time.elapsed()); - if (ms < 1.0) ms = 1.0; - d_speed = (exactValue() - exactPrevValue()) / ms; - d_time.start(); - } - if (value() != prevValue()) - emit sliderMoved(value(), _id); - emit sliderMoved(value(), _id, (bool)(e->modifiers() & Qt::ShiftModifier)); + setPosition(e->pos()); + if (d_mass > 0.0) + { + ms = double(d_time.elapsed()); + if (ms < 1.0) ms = 1.0; + d_speed = (exactValue() - exactPrevValue()) / ms; + d_time.start(); + } + if (value() != prevValue()) + { + emit sliderMoved(value(), _id); + emit sliderMoved(value(), _id, (bool)(e->modifiers() & Qt::ShiftModifier)); + } } } diff --git a/muse2/muse/widgets/tracks_duplicate_base.ui b/muse2/muse/widgets/tracks_duplicate_base.ui index 601c9f25..8c5b6a71 100644 --- a/muse2/muse/widgets/tracks_duplicate_base.ui +++ b/muse2/muse/widgets/tracks_duplicate_base.ui @@ -110,7 +110,7 @@ <item> <widget class="QCheckBox" name="standardCtrlsCheckBox"> <property name="text"> - <string>Copy standard controllers (vol, pan)</string> + <string>Copy standard (vol, pan) and synth controllers</string> </property> <property name="checked"> <bool>true</bool> @@ -119,9 +119,6 @@ </item> <item> <widget class="QCheckBox" name="pluginsCheckBox"> - <property name="enabled"> - <bool>false</bool> - </property> <property name="text"> <string>Copy effects rack plugins</string> </property> diff --git a/muse2/muse/widgets/vst_native_editor.cpp b/muse2/muse/widgets/vst_native_editor.cpp index b194529d..651d817f 100644 --- a/muse2/muse/widgets/vst_native_editor.cpp +++ b/muse2/muse/widgets/vst_native_editor.cpp @@ -157,7 +157,7 @@ void VstNativeEditor::open(MusECore::VstNativeSynthIF* sif) show(); raise(); activateWindow(); - _sif->idleEditor(); + ///_sif->idleEditor(); // REMOVE Tim. Or keep. } #if defined(Q_WS_X11) |