fix incorrect use of MidiBuffer::reserve() and MidiBuffer::write() if channel mask...

[ardour.git] / gtk2_ardour / processor_box.cc

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 3ccb97e5cad20b690f6c9ac7257e4ba82427ef48..9f2f1ed1e5b6739f14723dbd8e5f918644d2bbc7 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -300,8 +300,7 @@ ProcessorEntry::name () const
 SendProcessorEntry::SendProcessorEntry (boost::shared_ptr<Send> s, Width w)
        : ProcessorEntry (s, w),
          _send (s),
-         /* set the adjustment to a gain of 0dB so that the fader's default value is right */
-         _adjustment (0.781787, 0, 1, 0.01, 0.1),
+         _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1),
          _fader (_slider, &_adjustment, 0, false),
          _ignore_gain_change (false)
 {
@@ -326,9 +325,7 @@ SendProcessorEntry::setup_slider_pix ()
 void
 SendProcessorEntry::show_gain ()
 {
-       ENSURE_GUI_THREAD (*this, &SendProcessorEntry::show_gain)
-
-       float const value = gain_to_slider_position (_send->amp()->gain ());
+       float const value = gain_to_slider_position_with_max (_send->amp()->gain (), Config->get_max_gain());
 
        if (_adjustment.get_value() != value) {
                _ignore_gain_change = true;
@@ -350,7 +347,7 @@ SendProcessorEntry::gain_adjusted ()
                return;
        }
 
-       _send->amp()->set_gain (slider_position_to_gain (_adjustment.get_value()), this);
+       _send->amp()->set_gain (slider_position_to_gain_with_max (_adjustment.get_value(), Config->get_max_gain()), this);
 }
 
 void
@@ -826,14 +823,11 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                processor = child->processor ();
        }
 
-       int ret = false;
-
        if (processor && Keyboard::is_delete_event (ev)) {
 
                Glib::signal_idle().connect (sigc::bind (
                                sigc::mem_fun(*this, &ProcessorBox::idle_delete_processor),
                                boost::weak_ptr<Processor>(processor)));
-               ret = true;
 
        } else if (Keyboard::is_context_menu_event (ev)) {
 
@@ -852,7 +846,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                }
 
                show_processor_menu (ev->time);
-               ret = true;
 
        } else if (processor && Keyboard::is_button2_event (ev)
 #ifndef GTKOSX
@@ -867,8 +860,6 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry
                } else {
                        processor->activate ();
                }
-               ret = true;
-
        }
 
        return false;