X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgain_meter.cc;h=8ef83cfad5b4e2e98446089992e17c1bcad4f3e4;hb=ad942b104a80c74c689e0c1b5c016d1870850830;hp=d72e09be1000bc968b5cb773a4a72fcf4c8c3307;hpb=e81ee94d47f83ee46fbd2a25861dd3896aca131d;p=ardour.git diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index d72e09be10..8ef83cfad5 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -26,12 +26,12 @@ #include "ardour/session.h" #include "ardour/session_route.h" #include "ardour/dB.h" +#include "ardour/utils.h" #include #include #include #include -#include #include #include #include "midi++/manager.h" @@ -40,11 +40,12 @@ #include "ardour_ui.h" #include "gain_meter.h" -#include "utils.h" +#include "global_signals.h" #include "logmeter.h" #include "gui_thread.h" #include "keyboard.h" #include "public_editor.h" +#include "utils.h" #include "ardour/session.h" #include "ardour/route.h" @@ -56,8 +57,8 @@ using namespace ARDOUR; using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; -using namespace sigc; using namespace std; +using Gtkmm2ext::Keyboard; sigc::signal GainMeterBase::ResetAllPeakDisplays; sigc::signal GainMeterBase::ResetGroupPeakDisplays; @@ -74,48 +75,51 @@ GainMeter::setup_slider_pix () } } -GainMeterBase::GainMeterBase (Session& s, +GainMeterBase::GainMeterBase (Session* s, const Glib::RefPtr& pix, - bool horizontal) - : _session (s) - // 0.781787 is the value needed for gain to be set to 0. - , gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1) + bool horizontal, + int fader_length) + : gain_adjustment (0.781787, 0.0, 1.0, 0.01, 0.1) // 0.781787 is the value needed for gain to be set to 0. , gain_automation_style_button ("") , gain_automation_state_button ("") + , style_changed (false) , dpi_changed (false) , _is_midi (false) { using namespace Menu_Helpers; + set_session (s); + ignore_toggle = false; meter_menu = 0; next_release_selects = false; - style_changed = true; _width = Wide; if (horizontal) { - gain_slider = manage (new HSliderController (pix, + gain_slider = manage (new HSliderController (pix, &gain_adjustment, + fader_length, false)); } else { gain_slider = manage (new VSliderController (pix, &gain_adjustment, + fader_length, false)); } level_meter = new LevelMeter(_session); - gain_slider->signal_button_press_event().connect (mem_fun(*this, &GainMeter::start_gain_touch)); - gain_slider->signal_button_release_event().connect (mem_fun(*this, &GainMeter::end_gain_touch)); + gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press)); + gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release)); gain_slider->set_name ("GainFader"); gain_display.set_name ("MixerStripGainDisplay"); gain_display.set_has_frame (false); set_size_request_to_display_given_text (gain_display, "-80.g", 2, 6); /* note the descender */ - gain_display.signal_activate().connect (mem_fun (*this, &GainMeter::gain_activated)); - gain_display.signal_focus_in_event().connect (mem_fun (*this, &GainMeter::gain_focused), false); - gain_display.signal_focus_out_event().connect (mem_fun (*this, &GainMeter::gain_focused), false); + gain_display.signal_activate().connect (sigc::mem_fun (*this, &GainMeter::gain_activated)); + gain_display.signal_focus_in_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); + gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); peak_display.set_name ("MixerStripPeakDisplay"); // peak_display.set_has_frame (false); @@ -128,8 +132,8 @@ GainMeterBase::GainMeterBase (Session& s, gain_automation_style_button.set_name ("MixerAutomationModeButton"); gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Fader automation type")); + ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); + ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); @@ -143,16 +147,16 @@ GainMeterBase::GainMeterBase (Session& s, gain_astate_menu.set_name ("ArdourContextMenu"); gain_astyle_menu.set_name ("ArdourContextMenu"); - gain_adjustment.signal_value_changed().connect (mem_fun(*this, &GainMeterBase::gain_adjusted)); - peak_display.signal_button_release_event().connect (mem_fun(*this, &GainMeterBase::peak_button_release), false); - gain_display.signal_key_press_event().connect (mem_fun(*this, &GainMeterBase::gain_key_press), false); + gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted)); + peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeterBase::peak_button_release), false); + gain_display.signal_key_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_key_press), false); - ResetAllPeakDisplays.connect (mem_fun(*this, &GainMeterBase::reset_peak_display)); - ResetGroupPeakDisplays.connect (mem_fun(*this, &GainMeterBase::reset_group_peak_display)); + ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_peak_display)); + ResetGroupPeakDisplays.connect (sigc::mem_fun(*this, &GainMeterBase::reset_group_peak_display)); - UI::instance()->theme_changed.connect (mem_fun(*this, &GainMeterBase::on_theme_changed)); - ColorsChanged.connect (bind(mem_fun (*this, &GainMeterBase::color_handler), false)); - DPIReset.connect (bind(mem_fun (*this, &GainMeterBase::color_handler), true)); + UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &GainMeterBase::on_theme_changed)); + ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false)); + DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true)); } GainMeterBase::~GainMeterBase () @@ -167,6 +171,7 @@ GainMeterBase::set_controls (boost::shared_ptr r, boost::shared_ptr amp) { connections.clear (); + model_connections.drop_connections (); if (!pm && !amp) { level_meter->set_meter (0); @@ -205,30 +210,30 @@ GainMeterBase::set_controls (boost::shared_ptr r, gain_astate_menu.items().clear (); gain_astate_menu.items().push_back (MenuElem (_("Manual"), - bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), Evoral::Parameter(GainAutomation), (AutoState) Off))); gain_astate_menu.items().push_back (MenuElem (_("Play"), - bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), Evoral::Parameter(GainAutomation), (AutoState) Play))); gain_astate_menu.items().push_back (MenuElem (_("Write"), - bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), Evoral::Parameter(GainAutomation), (AutoState) Write))); gain_astate_menu.items().push_back (MenuElem (_("Touch"), - bind (mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), + sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state), Evoral::Parameter(GainAutomation), (AutoState) Touch))); - connections.push_back (gain_automation_style_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); - connections.push_back (gain_automation_state_button.signal_button_press_event().connect (mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false)); + connections.push_back (gain_automation_style_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_style_button_event), false)); + connections.push_back (gain_automation_state_button.signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeterBase::gain_automation_state_button_event), false)); boost::shared_ptr gc = amp->gain_control(); - - connections.push_back (gc->alist()->automation_state_changed.connect (mem_fun(*this, &GainMeter::gain_automation_state_changed))); - connections.push_back (gc->alist()->automation_style_changed.connect (mem_fun(*this, &GainMeter::gain_automation_style_changed))); - + + gc->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context()); + gc->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context()); + gain_automation_state_changed (); } - - connections.push_back (amp->gain_control()->Changed.connect (mem_fun (*this, &GainMeterBase::gain_changed))); + + amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context()); gain_changed (); show_gain (); @@ -393,16 +398,14 @@ void GainMeterBase::gain_adjusted () { if (!ignore_toggle) { - if (_route) { - if (_route->amp() == _amp) { - if (_is_midi) { - _route->set_gain (gain_adjustment.get_value(), this); - } else { - _route->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); - } + if (_route && _route->amp() == _amp) { + if (_is_midi) { + _route->set_gain (gain_adjustment.get_value(), this); } else { - _amp->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); + _route->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); } + } else { + _amp->set_gain (slider_position_to_gain (gain_adjustment.get_value()), this); } } @@ -434,7 +437,7 @@ GainMeterBase::effective_gain_display () void GainMeterBase::gain_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &GainMeterBase::effective_gain_display)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&GainMeterBase::effective_gain_display, this)); } void @@ -446,7 +449,10 @@ GainMeterBase::set_meter_strip_name (const char * name) void GainMeterBase::set_fader_name (const char * name) { - gain_slider->set_name (name); + uint32_t rgb_active = rgba_from_style (name, 0xff, 0, 0xff, 0, "bg", STATE_ACTIVE, false); + uint32_t rgb_normal = rgba_from_style (name, 0xff, 0xff, 0, 0, "bg", STATE_NORMAL, false); + + gain_slider->set_border_colors (rgb_normal, rgb_active); } void @@ -469,6 +475,10 @@ next_meter_point (MeterPoint mp) break; case MeterPostFader: + return MeterOutput; + break; + + case MeterOutput: return MeterCustom; break; @@ -515,12 +525,7 @@ GainMeterBase::meter_press(GdkEventButton* ev) /* Primary+Tertiary-click applies change to all routes */ - _session.begin_reversible_command (_("meter point change")); - Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this); - _session.foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point())); - cmd->mark(); - _session.add_command (cmd); - _session.commit_reversible_command (); + _session->foreach_route (this, &GainMeterBase::set_meter_point, next_meter_point (_route->meter_point())); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { @@ -530,12 +535,7 @@ GainMeterBase::meter_press(GdkEventButton* ev) */ if (ev->button == 1) { - _session.begin_reversible_command (_("meter point change")); - Session::GlobalMeteringStateCommand *cmd = new Session::GlobalMeteringStateCommand (_session, this); - set_mix_group_meter_point (*_route, next_meter_point (_route->meter_point())); - cmd->mark(); - _session.add_command (cmd); - _session.commit_reversible_command (); + set_route_group_meter_point (*_route, next_meter_point (_route->meter_point())); } } else { @@ -544,7 +544,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())); } } } @@ -557,8 +557,8 @@ GainMeterBase::meter_press(GdkEventButton* ev) gint GainMeterBase::meter_release(GdkEventButton*) { - if(!ignore_toggle){ - if (wait_for_release){ + if (!ignore_toggle) { + if (wait_for_release) { wait_for_release = false; if (_route) { @@ -573,18 +573,18 @@ 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 -GainMeterBase::set_mix_group_meter_point (Route& route, MeterPoint mp) +GainMeterBase::set_route_group_meter_point (Route& route, MeterPoint mp) { - RouteGroup* mix_group; + RouteGroup* route_group; - if((mix_group = route.route_group()) != 0){ - mix_group->apply (&Route::set_meter_point, mp, this); + if ((route_group = route.route_group ()) != 0) { + route_group->foreach_route (boost::bind (&Route::set_meter_point, _1, mp, false)); } else { - route.set_meter_point (mp, this); + route.set_meter_point (mp); } } @@ -596,18 +596,25 @@ GainMeterBase::meter_point_clicked () } } -gint -GainMeterBase::start_gain_touch (GdkEventButton*) +bool +GainMeterBase::gain_slider_button_press (GdkEventButton* ev) { - _amp->gain_control()->start_touch (); - return FALSE; + switch (ev->type) { + case GDK_BUTTON_PRESS: + _amp->gain_control()->start_touch (_amp->session().transport_frame()); + break; + default: + return false; + } + + return true; } -gint -GainMeterBase::end_gain_touch (GdkEventButton*) +bool +GainMeterBase::gain_slider_button_release (GdkEventButton* ev) { - _amp->gain_control()->stop_touch (); - return FALSE; + _amp->gain_control()->stop_touch (false, _amp->session().transport_frame()); + return true; } gint @@ -720,7 +727,7 @@ GainMeterBase::gain_automation_style_changed () void GainMeterBase::gain_automation_state_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &GainMeterBase::gain_automation_state_changed)); + ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed) bool x; @@ -748,7 +755,7 @@ GainMeterBase::gain_automation_state_changed () gain_watching.disconnect(); if (x) { - gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (mem_fun (*this, &GainMeterBase::effective_gain_display)); + gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display)); } } @@ -794,21 +801,21 @@ GainMeterBase::on_theme_changed() style_changed = true; } -GainMeter::GainMeter (Session& s) - : GainMeterBase (s, slider, false) +GainMeter::GainMeter (Session* s, int fader_length) + : GainMeterBase (s, slider, false, fader_length) { gain_display_box.set_homogeneous (true); gain_display_box.set_spacing (2); gain_display_box.pack_start (gain_display, true, true); meter_metric_area.set_name ("AudioTrackMetrics"); - set_size_request_to_display_given_text (meter_metric_area, "-50", 0, 0); + set_size_request_to_display_given_text (meter_metric_area, "-127", 0, 0); gain_automation_style_button.set_name ("MixerAutomationModeButton"); gain_automation_state_button.set_name ("MixerAutomationPlaybackButton"); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_state_button, _("Fader automation mode")); - ARDOUR_UI::instance()->tooltips().set_tip (gain_automation_style_button, _("Fader automation type")); + ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode")); + ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type")); gain_automation_style_button.unset_flags (Gtk::CAN_FOCUS); gain_automation_state_button.unset_flags (Gtk::CAN_FOCUS); @@ -816,22 +823,19 @@ GainMeter::GainMeter (Session& s) gain_automation_state_button.set_size_request(15, 15); gain_automation_style_button.set_size_request(15, 15); - HBox* fader_centering_box = manage (new HBox); - fader_centering_box->pack_start (*gain_slider, true, false); - fader_vbox = manage (new Gtk::VBox()); fader_vbox->set_spacing (0); - fader_vbox->pack_start (*fader_centering_box, false, false, 0); + fader_vbox->pack_start (*gain_slider, false, false, 0); hbox.set_spacing (2); - hbox.pack_start (*fader_vbox, true, true); + hbox.pack_start (*fader_vbox, false, false, 4); set_spacing (2); pack_start (gain_display_box, Gtk::PACK_SHRINK); pack_start (hbox, Gtk::PACK_SHRINK); - meter_metric_area.signal_expose_event().connect (mem_fun(*this, &GainMeter::meter_metrics_expose)); + meter_metric_area.signal_expose_event().connect (sigc::mem_fun(*this, &GainMeter::meter_metrics_expose)); } void @@ -853,13 +857,22 @@ GainMeter::set_controls (boost::shared_ptr r, GainMeterBase::set_controls (r, meter, amp); + if (_meter) { + _meter->ConfigurationChanged.connect ( + model_connections, invalidator (*this), ui_bind (&GainMeter::meter_configuration_changed, this, _1), gui_context() + ); + + meter_configuration_changed (_meter->input_streams ()); + } + + /* if we have a non-hidden route (ie. we're not the click or the auditioner), pack some route-dependent stuff. */ gain_display_box.pack_end (peak_display, true, true); - hbox.pack_end (*level_meter, true, true); + hbox.pack_start (*level_meter, true, true); if (r && !r->is_hidden()) { fader_vbox->pack_start (gain_automation_state_button, false, false, 0); @@ -878,15 +891,12 @@ GainMeter::get_gm_width () } Glib::RefPtr -GainMeter::render_metrics (Gtk::Widget& w) +GainMeter::render_metrics (Gtk::Widget& w, vector types) { Glib::RefPtr win (w.get_window()); - Glib::RefPtr fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL)); Glib::RefPtr bg_gc (w.get_style()->get_bg_gc (Gtk::STATE_NORMAL)); - gint width, height; - int db_points[] = { -50, -40, -20, -30, -10, -3, 0, 4 }; - char buf[32]; + gint width, height; win->get_size (width, height); Glib::RefPtr pixmap = Gdk::Pixmap::create (win, width, height); @@ -895,24 +905,88 @@ GainMeter::render_metrics (Gtk::Widget& w) pixmap->draw_rectangle (bg_gc, true, 0, 0, width, height); - Glib::RefPtr layout = w.create_pango_layout(""); - - for (uint32_t i = 0; i < sizeof (db_points)/sizeof (db_points[0]); ++i) { - - float fraction = log_meter (db_points[i]); - gint pos = height - (gint) floor (height * fraction); - - snprintf (buf, sizeof (buf), "%d", abs (db_points[i])); - - layout->set_text (buf); - - /* we want logical extents, not ink extents here */ - - int width, height; - layout->get_pixel_size (width, height); + Glib::RefPtr layout = w.create_pango_layout (""); + + for (vector::const_iterator i = types.begin(); i != types.end(); ++i) { + + Glib::RefPtr fg_gc (w.get_style()->get_fg_gc (Gtk::STATE_NORMAL)); + + if (types.size() > 1) { + /* we're overlaying more than 1 set of marks, so use different colours */ + Gdk::Color c; + switch (*i) { + case DataType::AUDIO: + c.set_rgb_p (1, 1, 1); + break; + case DataType::MIDI: + c.set_rgb_p (0.2, 0.2, 0.5); + break; + } + + fg_gc->set_rgb_fg_color (c); + } - pixmap->draw_line (fg_gc, 0, pos, 4, pos); - pixmap->draw_layout (fg_gc, 6, pos - (height/2), layout); + vector points; + + switch (*i) { + case DataType::AUDIO: + points.push_back (-50); + points.push_back (-40); + points.push_back (-30); + points.push_back (-20); + points.push_back (-10); + points.push_back (-3); + points.push_back (0); + points.push_back (4); + break; + + case DataType::MIDI: + points.push_back (0); + if (types.size() == 1) { + points.push_back (32); + } else { + /* tweak so as not to overlay the -30dB mark */ + points.push_back (48); + } + points.push_back (64); + points.push_back (96); + points.push_back (127); + break; + } + + char buf[32]; + + for (vector::const_iterator j = points.begin(); j != points.end(); ++j) { + + float fraction = 0; + switch (*i) { + case DataType::AUDIO: + fraction = log_meter (*j); + break; + case DataType::MIDI: + fraction = *j / 127.0; + break; + } + + gint const pos = height - (gint) floor (height * fraction); + + snprintf (buf, sizeof (buf), "%d", abs (*j)); + + layout->set_text (buf); + + /* we want logical extents, not ink extents here */ + + int tw, th; + layout->get_pixel_size (tw, th); + + pixmap->draw_line (fg_gc, 0, pos, 4, pos); + + int p = pos - (th / 2); + p = min (p, height - th); + p = max (p, 0); + + pixmap->draw_layout (fg_gc, 6, p, layout); + } } return pixmap; @@ -921,12 +995,8 @@ GainMeter::render_metrics (Gtk::Widget& w) gint GainMeter::meter_metrics_expose (GdkEventExpose *ev) { - static Glib::RefPtr meter_style; - if (style_changed) { - meter_style = meter_metric_area.get_style(); - } Glib::RefPtr win (meter_metric_area.get_window()); - Glib::RefPtr bg_gc (meter_style->get_bg_gc (Gtk::STATE_INSENSITIVE)); + Glib::RefPtr bg_gc (meter_metric_area.get_style()->get_bg_gc (Gtk::STATE_INSENSITIVE)); GdkRectangle base_rect; GdkRectangle draw_rect; gint width, height; @@ -942,7 +1012,7 @@ GainMeter::meter_metrics_expose (GdkEventExpose *ev) std::map >::iterator i = metric_pixmaps.find (meter_metric_area.get_name()); if (i == metric_pixmaps.end() || style_changed || dpi_changed) { - pixmap = render_metrics (meter_metric_area); + pixmap = render_metrics (meter_metric_area, _types); } else { pixmap = i->second; } @@ -963,4 +1033,17 @@ GainMeterBase::get_controllable() } } +void +GainMeter::meter_configuration_changed (ChanCount c) +{ + _types.clear (); + + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + if (c.get (*i) > 0) { + _types.push_back (*i); + } + } + style_changed = true; + meter_metric_area.queue_draw (); +}