diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-03 13:40:34 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-03 13:40:34 +0000 |
commit | 3104041e67b0f7c476c7478ce4b7a4af3d277da7 (patch) | |
tree | d9bfaafe7983caca4f3292d5f9835e5bbd0d38b8 /gtk2_ardour | |
parent | d166d0584f611d5e1ff85a5008e87c9e21e04952 (diff) |
meter point restore handling, and related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6854 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/gain_meter.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/route_time_axis.h | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 47d11f2029..63c8651520 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -539,7 +539,7 @@ GainMeterBase::meter_press(GdkEventButton* ev) // XXX no undo yet - _route->set_meter_point (next_meter_point (_route->meter_point()), this); + _route->set_meter_point (next_meter_point (_route->meter_point())); } } } @@ -568,7 +568,7 @@ GainMeterBase::meter_release(GdkEventButton*) void GainMeterBase::set_meter_point (Route& route, MeterPoint mp) { - route.set_meter_point (mp, this); + route.set_meter_point (mp); } void @@ -577,9 +577,9 @@ GainMeterBase::set_mix_group_meter_point (Route& route, MeterPoint mp) RouteGroup* mix_group; if((mix_group = route.route_group()) != 0){ - mix_group->apply (&Route::set_meter_point, mp, this); + mix_group->apply (&Route::set_meter_point, mp); } else { - route.set_meter_point (mp, this); + route.set_meter_point (mp); } } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index a0cc11092e..64b388f030 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -412,7 +412,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) _("Click to Add/Edit Comments"): _route->comment()); - _route->meter_change.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::meter_changed, this, _1), gui_context()); + _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context()); _route->input()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context()); _route->output()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context()); _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context()); @@ -1599,9 +1599,9 @@ MixerStrip::engine_running () /** Called when the metering point has changed */ void -MixerStrip::meter_changed (void *src) +MixerStrip::meter_changed () { - ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src) + ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed) switch (_route->meter_point()) { case MeterInput: diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index acb69534b3..3e264502a4 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -156,7 +156,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox Gtk::Button meter_point_button; Gtk::Label meter_point_label; - void meter_changed (void *); + void meter_changed (); Gtk::Button diskstream_button; Gtk::Label diskstream_label; diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 9c2eccbff9..b3b3f360e3 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -190,7 +190,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh } controls_hbox.pack_start(gm.get_level_meter(), false, false); - _route->meter_change.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::meter_changed, this, _1), gui_context()); + _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context()); _route->input()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); _route->output()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); @@ -2290,9 +2290,9 @@ RouteTimeAxisView::clear_meter () } void -RouteTimeAxisView::meter_changed (void *src) +RouteTimeAxisView::meter_changed () { - ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed, src) + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed) reset_meter(); } diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 763504e781..7f35e54485 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -150,7 +150,7 @@ public: void reset_meter (); void clear_meter (); void io_changed (ARDOUR::IOChange, void *); - void meter_changed (void *); + void meter_changed (); void effective_gain_display () { gm.effective_gain_display(); } static void setup_slider_pix (); |