#include <limits.h>
#include "ardour/amp.h"
+#include "ardour/logmeter.h"
#include "ardour/route_group.h"
#include "ardour/session_route.h"
#include "ardour/dB.h"
#include <gdkmm/color.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
#include <gtkmm2ext/gtk_ui.h>
#include "pbd/fastlog.h"
#include "pbd/stacktrace.h"
-#include "ardour_ui.h"
#include "gain_meter.h"
-#include "global_signals.h"
-#include "logmeter.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "public_editor.h"
#include "utils.h"
#include "meter_patterns.h"
+#include "timers.h"
+#include "tooltips.h"
+#include "ui_config.h"
#include "ardour/session.h"
#include "ardour/route.h"
#include "ardour/meter.h"
#include "ardour/audio_track.h"
#include "ardour/midi_track.h"
+#include "ardour/dB.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
using Gtkmm2ext::Keyboard;
using namespace ArdourMeter;
+static void
+reset_cursor_to_default (Gtk::Entry* widget)
+{
+ Glib::RefPtr<Gdk::Window> win = widget->get_text_window ();
+ if (win) {
+ /* C++ doesn't provide a pointer argument version of this
+ (i.e. you cannot set to NULL to get the default/parent
+ cursor)
+ */
+ gdk_window_set_cursor (win->gobj(), 0);
+ }
+}
+
+static void
+reset_cursor_to_default_state (Gtk::StateType, Gtk::Entry* widget)
+{
+ reset_cursor_to_default (widget);
+}
+
+sigc::signal<void, ARDOUR::AutoState> GainMeterBase::ChangeGainAutomationState;
+
GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int fader_girth)
- : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1)
+ : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), // value
+ 0.0, // lower
+ 1.0, // upper
+ dB_coeff_step(Config->get_max_gain()) / 10.0, // step increment
+ dB_coeff_step(Config->get_max_gain())) // page increment
, gain_automation_style_button ("")
, gain_automation_state_button ("")
+ , gain_astate_propagate (false)
, _data_type (DataType::AUDIO)
-
{
using namespace Menu_Helpers;
next_release_selects = false;
_width = Wide;
+ fader_length = rint (fader_length * UIConfiguration::instance().get_ui_scale());
+ fader_girth = rint (fader_girth * UIConfiguration::instance().get_ui_scale());
+
if (horizontal) {
- gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth, false));
+ gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
} else {
- gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, fader_girth, false));
+ gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth));
}
level_meter = new LevelMeterHBox(_session);
meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press));
meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK);
- gain_slider->signal_button_press_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_press), false);
- gain_slider->signal_button_release_event().connect (sigc::mem_fun(*this, &GainMeter::gain_slider_button_release), false);
+ gain_slider->set_tweaks (PixFader::Tweaks(PixFader::NoButtonForward | PixFader::NoVerticalScroll));
+ gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch));
+ gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch));
gain_slider->set_name ("GainFader");
gain_display.set_name ("MixerStripGainDisplay");
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);
+ gain_display.set_alignment (0.5);
peak_display.set_name ("MixerStripPeakDisplay");
set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
max_peak = minus_infinity();
- peak_display.set_label (_("-inf"));
+ peak_display.set_text (_("-inf"));
+ peak_display.set_alignment (0.5);
+
+ /* stuff related to the fact that the peak display is not, in
+ fact, supposed to be a text entry.
+ */
+ peak_display.set_events (peak_display.get_events() & ~(Gdk::EventMask (Gdk::LEAVE_NOTIFY_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK)));
+ peak_display.signal_map().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default), &peak_display));
+ peak_display.signal_state_changed().connect (sigc::bind (sigc::ptr_fun (reset_cursor_to_default_state), &peak_display));
peak_display.unset_flags (Gtk::CAN_FOCUS);
+ peak_display.set_editable (false);
gain_automation_style_button.set_name ("mixer strip button");
gain_automation_state_button.set_name ("mixer strip button");
- ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
- ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
+ set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+ set_tooltip (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);
gain_astyle_menu.items().push_back (MenuElem (_("Abs")));
gain_astate_menu.set_name ("ArdourContextMenu");
+ gain_astate_menu.set_reserve_toggle_size(false);
gain_astyle_menu.set_name ("ArdourContextMenu");
- gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::gain_adjusted));
+ gain_adjustment.signal_value_changed().connect (sigc::mem_fun(*this, &GainMeterBase::fader_moved));
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);
RedrawMetrics.connect (sigc::mem_fun(*this, &GainMeterBase::redraw_metrics));
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));
-
-// PBD::ScopedConnection _config_connection;
-// Config->ParameterChanged.connect ( _config_connection, MISSING_INVALIDATOR, boost::bind(&GainMeterBase::set_flat_buttons, this, _1), gui_context() );
-}
-
-void
-GainMeterBase::set_flat_buttons ()
-{
-printf("set_flat_butt\n");
-// gain_slider->set_flat_buttons( ARDOUR_UI::config()->get_flat_buttons() );
+ UIConfiguration::instance().ColorsChanged.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), false));
+ UIConfiguration::instance().DPIReset.connect (sigc::bind(sigc::mem_fun (*this, &GainMeterBase::color_handler), true));
}
GainMeterBase::~GainMeterBase ()
void
GainMeterBase::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> pm,
- boost::shared_ptr<Amp> amp)
+ boost::shared_ptr<Amp> amp,
+ boost::shared_ptr<GainControl> control)
{
- connections.clear ();
+ connections.clear ();
model_connections.drop_connections ();
- if (!pm && !amp) {
+ /* no meter and no control? nothing to do ... */
+
+ if (!pm && !control) {
level_meter->set_meter (0);
gain_slider->set_controllable (boost::shared_ptr<PBD::Controllable>());
_meter.reset ();
_amp.reset ();
_route.reset ();
+ _control.reset ();
return;
}
_meter = pm;
_amp = amp;
_route = r;
+ _control = control;
- level_meter->set_meter (pm.get());
- gain_slider->set_controllable (amp->gain_control());
+ level_meter->set_meter (pm.get());
+ gain_slider->set_controllable (_control);
if (amp) {
amp->ConfigurationChanged.connect (
gain_astate_menu.items().clear ();
gain_astate_menu.items().push_back (MenuElem (S_("Automation|Manual"),
- sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
- Evoral::Parameter(GainAutomation), (AutoState) ARDOUR::Off)));
+ sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Off)));
gain_astate_menu.items().push_back (MenuElem (_("Play"),
- sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
- Evoral::Parameter(GainAutomation), (AutoState) Play)));
+ sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Play)));
gain_astate_menu.items().push_back (MenuElem (_("Write"),
- sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
- Evoral::Parameter(GainAutomation), (AutoState) Write)));
+ sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Write)));
gain_astate_menu.items().push_back (MenuElem (_("Touch"),
- sigc::bind (sigc::mem_fun (*(amp.get()), &Automatable::set_parameter_automation_state),
- Evoral::Parameter(GainAutomation), (AutoState) Touch)));
+ sigc::bind (sigc::mem_fun (*this, &GainMeterBase::set_gain_astate), (AutoState) ARDOUR::Touch)));
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));
+ connections.push_back (ChangeGainAutomationState.connect (sigc::mem_fun(*this, &GainMeterBase::set_gain_astate)));
- boost::shared_ptr<AutomationControl> gc = amp->gain_control();
-
- 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());
+ _control->alist()->automation_state_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_state_changed, this), gui_context());
+ _control->alist()->automation_style_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::gain_automation_style_changed, this), gui_context());
gain_automation_state_changed ();
}
- amp->gain_control()->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
+ _control->Changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeterBase::gain_changed, this), gui_context());
gain_changed ();
show_gain ();
update_gain_sensitive ();
+
+ if (!_meter) {
+ peak_display.hide ();
+ } else {
+ peak_display.show ();
+ }
+}
+
+void
+GainMeterBase::set_gain_astate (AutoState as)
+{
+ if (gain_astate_propagate) {
+ gain_astate_propagate = false;
+ ChangeGainAutomationState (as);
+ return;
+ }
+ _amp->set_parameter_automation_state (Evoral::Parameter (GainAutomation), as);
}
void
if (_amp->output_streams().n_midi() <= _amp->output_streams().n_audio()) {
_data_type = DataType::AUDIO;
- gain_adjustment.set_lower (0.0);
- gain_adjustment.set_upper (1.0);
- gain_adjustment.set_step_increment (0.01);
- gain_adjustment.set_page_increment (0.1);
- gain_slider->set_default_value (gain_to_slider_position (1));
+ gain_adjustment.set_lower (GAIN_COEFF_ZERO);
+ gain_adjustment.set_upper (GAIN_COEFF_UNITY);
+ gain_adjustment.set_step_increment (dB_coeff_step(Config->get_max_gain()) / 10.0);
+ gain_adjustment.set_page_increment (dB_coeff_step(Config->get_max_gain()));
+ gain_slider->set_default_value (gain_to_slider_position (GAIN_COEFF_UNITY));
} else {
_data_type = DataType::MIDI;
gain_adjustment.set_lower (0.0);
ignore_toggle = false;
effective_gain_display ();
-
+
_previous_amp_output_streams = _amp->output_streams ();
}
GainMeterBase::setup_meters (int len)
{
int meter_width = 5;
+ uint32_t meter_channels = 0;
+ if (_meter) {
+ meter_channels = _meter->input_streams().n_total();
+ } else if (_route) {
+ meter_channels = _route->shared_peak_meter()->input_streams().n_total();
+ }
switch (_width) {
case Wide:
//meter_ticks1_area.show();
//meter_ticks2_area.show();
meter_metric_area.show();
- if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+ if (meter_channels == 1) {
meter_width = 10;
}
break;
case Narrow:
- if (_route && _route->shared_peak_meter()->input_streams().n_total() > 1) {
+ if (meter_channels > 1) {
meter_width = 4;
}
//meter_ticks1_area.hide();
{
switch (_width) {
case Wide:
- hbox.set_homogeneous(true);
+ {
+ uint32_t meter_channels = 0;
+ if (_meter) {
+ meter_channels = _meter->input_streams().n_total();
+ } else if (_route) {
+ meter_channels = _route->shared_peak_meter()->input_streams().n_total();
+ }
+ hbox.set_homogeneous(meter_channels < 7 ? true : false);
+ }
break;
case Narrow:
hbox.set_homogeneous(false);
{
_meter->reset_max();
level_meter->clear_meters();
- max_peak = -INFINITY;
- peak_display.set_label (_("-inf"));
+ max_peak = minus_infinity ();
+ peak_display.set_text (_("-inf"));
peak_display.set_name ("MixerStripPeakDisplay");
}
{
float f;
- {
- // Switch to user's preferred locale so that
- // if they use different LC_NUMERIC conventions,
- // we will honor them.
-
- PBD::LocaleGuard lg ("");
- if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
- return;
- }
+ // Use the user's preferred locale/LC_NUMERIC setting
+ if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
+ return;
}
/* clamp to displayable values */
if (_data_type == DataType::AUDIO) {
f = min (f, 6.0f);
- _amp->set_gain (dB_to_coefficient(f), this);
+ _control->set_value (dB_to_coefficient(f), Controllable::UseGroup);
} else {
f = min (fabs (f), 2.0f);
- _amp->set_gain (f, this);
+ _control->set_value (f, Controllable::UseGroup);
}
if (gain_display.has_focus()) {
}
void
-GainMeterBase::gain_adjusted ()
+GainMeterBase::fader_moved ()
{
- gain_t value;
+ if (!ignore_toggle) {
- /* convert from adjustment range (0..1) to gain coefficient */
+ gain_t value;
- if (_data_type == DataType::AUDIO) {
- value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
- } else {
- value = gain_adjustment.get_value();
- }
-
- if (!ignore_toggle) {
- if (_route && _route->amp() == _amp) {
- _route->set_gain (value, this);
+ /* convert from adjustment range (0..1) to gain coefficient */
+
+ if (_data_type == DataType::AUDIO) {
+ value = slider_position_to_gain_with_max (gain_adjustment.get_value(), Config->get_max_gain());
} else {
- _amp->set_gain (value, this);
+ value = gain_adjustment.get_value();
}
+
+ _control->set_value (value, Controllable::UseGroup);
}
show_gain ();
void
GainMeterBase::effective_gain_display ()
{
- float value = 0.0;
+ gain_t fader_position = 0;
switch (_data_type) {
case DataType::AUDIO:
- value = gain_to_slider_position_with_max (_amp->gain(), Config->get_max_gain());
+ /* the position of the fader should reflect any master gain,
+ * not just the control's own inherent value
+ */
+ fader_position = gain_to_slider_position_with_max (_control->get_value(), Config->get_max_gain());
break;
case DataType::MIDI:
- value = _amp->gain ();
+ fader_position = _control->get_value ();
break;
}
- if (gain_adjustment.get_value() != value) {
+ if (gain_adjustment.get_value() != fader_position) {
ignore_toggle = true;
- gain_adjustment.set_value (value);
+ gain_adjustment.set_value (fader_position);
ignore_toggle = false;
}
}
void
GainMeterBase::update_gain_sensitive ()
{
- bool x = !(_amp->gain_control()->alist()->automation_state() & Play);
+ bool x = !(_control->alist()->automation_state() & Play);
static_cast<Gtkmm2ext::SliderController*>(gain_slider)->set_sensitive (x);
}
break;
}
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
return MeterInput;
}
}
}
-bool
-GainMeterBase::gain_slider_button_press (GdkEventButton* ev)
+void
+GainMeterBase::amp_start_touch ()
{
- switch (ev->type) {
- case GDK_BUTTON_PRESS:
- _amp->gain_control()->start_touch (_amp->session().transport_frame());
- break;
- default:
- return false;
- }
-
- return false;
+ _control->start_touch (_control->session().transport_frame());
}
-bool
-GainMeterBase::gain_slider_button_release (GdkEventButton*)
+void
+GainMeterBase::amp_stop_touch ()
{
- _amp->gain_control()->stop_touch (false, _amp->session().transport_frame());
- return false;
+ _control->stop_touch (false, _control->session().transport_frame());
}
gint
switch (ev->button) {
case 1:
- gain_astate_menu.popup (1, ev->time);
+ gain_astate_propagate = Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier));
+ Gtkmm2ext::anchored_menu_popup(&gain_astate_menu,
+ &gain_automation_state_button,
+ "", 1, ev->time);
break;
default:
break;
{
switch (_width) {
case Wide:
- gain_automation_style_button.set_text (astyle_string(_amp->gain_control()->alist()->automation_style()));
+ gain_automation_style_button.set_text (astyle_string(_control->alist()->automation_style()));
break;
case Narrow:
- gain_automation_style_button.set_text (short_astyle_string(_amp->gain_control()->alist()->automation_style()));
+ gain_automation_style_button.set_text (short_astyle_string(_control->alist()->automation_style()));
break;
}
}
void
GainMeterBase::gain_automation_state_changed ()
{
- ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed)
-
- bool x;
+ ENSURE_GUI_THREAD (*this, &GainMeterBase::gain_automation_state_changed);
switch (_width) {
case Wide:
- gain_automation_state_button.set_text (astate_string(_amp->gain_control()->alist()->automation_state()));
+ gain_automation_state_button.set_text (astate_string(_control->alist()->automation_state()));
break;
case Narrow:
- gain_automation_state_button.set_text (short_astate_string(_amp->gain_control()->alist()->automation_state()));
+ gain_automation_state_button.set_text (short_astate_string(_control->alist()->automation_state()));
break;
}
- x = (_amp->gain_control()->alist()->automation_state() != ARDOUR::Off);
+ const bool automation_watch_required = (_control->alist()->automation_state() != ARDOUR::Off);
- if (gain_automation_state_button.get_active() != x) {
+ if (gain_automation_state_button.get_active() != automation_watch_required) {
ignore_toggle = true;
- gain_automation_state_button.set_active (x);
+ gain_automation_state_button.set_active (automation_watch_required);
ignore_toggle = false;
}
update_gain_sensitive ();
- /* start watching automation so that things move */
-
gain_watching.disconnect();
- if (x) {
- gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
+ if (automation_watch_required) {
+ /* start watching automation so that things move */
+ gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
+ } else {
+ /* update once to get the correct value shown as we re-enter off/manual mode */
+ effective_gain_display();
}
}
+const ChanCount
+GainMeterBase::meter_channels() const
+{
+ if (_meter) { return _meter->input_streams(); }
+ else { return ChanCount(); }
+}
void
GainMeterBase::update_meters()
{
if (mpeak > max_peak) {
max_peak = mpeak;
if (mpeak <= -200.0f) {
- peak_display.set_label (_("-inf"));
+ peak_display.set_text (_("-inf"));
} else {
snprintf (buf, sizeof(buf), "%.1f", mpeak);
- peak_display.set_label (buf);
+ peak_display.set_text (buf);
}
}
- if (mpeak >= Config->get_meter_peak()) {
+ if (mpeak >= UIConfiguration::instance().get_meter_peak()) {
peak_display.set_name ("MixerStripPeakDisplayPeak");
}
}
meter_ticks2_area.queue_draw ();
}
+#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))
+
GainMeter::GainMeter (Session* s, int fader_length)
: GainMeterBase (s, false, fader_length, 24)
, gain_display_box(true, 0)
}
gain_display_box.pack_start (gain_display, true, true);
+ if (peak_display.get_parent()) {
+ peak_display.get_parent()->remove (gain_display);
+ }
+ gain_display_box.pack_start (peak_display, true, true);
+
meter_metric_area.set_name ("AudioTrackMetrics");
- meter_metric_area.set_size_request(24, -1);
+ meter_metric_area.set_size_request(PX_SCALE(24, 24), -1);
gain_automation_style_button.set_name ("mixer strip button");
gain_automation_state_button.set_name ("mixer strip button");
- ARDOUR_UI::instance()->set_tip (gain_automation_state_button, _("Fader automation mode"));
- ARDOUR_UI::instance()->set_tip (gain_automation_style_button, _("Fader automation type"));
+ set_tooltip (gain_automation_state_button, _("Fader automation mode"));
+ set_tooltip (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);
- gain_automation_state_button.set_size_request(15, 15);
- gain_automation_style_button.set_size_request(15, 15);
+ gain_automation_state_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
+ gain_automation_style_button.set_size_request (PX_SCALE(12, 15), PX_SCALE(12, 15));
- fader_vbox = manage (new Gtk::VBox());
- fader_vbox->set_spacing (0);
- fader_vbox->pack_start (*gain_slider, true, true);
+ fader_vbox.set_spacing (0);
+ fader_vbox.pack_start (*gain_slider, true, true);
fader_alignment.set (0.5, 0.5, 0.0, 1.0);
- fader_alignment.add (*fader_vbox);
+ fader_alignment.add (fader_vbox);
hbox.pack_start (fader_alignment, true, true);
- set_spacing (2);
+ set_spacing (PX_SCALE(2, 2));
pack_start (gain_display_box, Gtk::PACK_SHRINK);
- pack_start (hbox, Gtk::PACK_SHRINK);
+ pack_start (hbox, true, true);
meter_alignment.set (0.5, 0.5, 0.0, 1.0);
meter_alignment.add (*level_meter);
meter_metric_area.signal_expose_event().connect (
sigc::mem_fun(*this, &GainMeter::meter_metrics_expose));
- meter_ticks1_area.set_size_request(3,-1);
- meter_ticks2_area.set_size_request(3,-1);
+ meter_ticks1_area.set_size_request (PX_SCALE(3, 3), -1);
+ meter_ticks2_area.set_size_request (PX_SCALE(3, 3), -1);
meter_ticks1_area.signal_expose_event().connect (
sigc::mem_fun(*this, &GainMeter::meter_ticks1_expose));
meter_hbox.pack_start (meter_ticks2_area, false, false);
meter_hbox.pack_start (meter_metric_area, false, false);
}
+#undef PX_SCALE
GainMeter::~GainMeter () { }
void
GainMeter::set_controls (boost::shared_ptr<Route> r,
boost::shared_ptr<PeakMeter> meter,
- boost::shared_ptr<Amp> amp)
+ boost::shared_ptr<Amp> amp,
+ boost::shared_ptr<GainControl> control)
{
if (meter_hbox.get_parent()) {
hbox.remove (meter_hbox);
// fader_vbox->remove (gain_automation_state_button);
// }
- GainMeterBase::set_controls (r, meter, amp);
+ GainMeterBase::set_controls (r, meter, amp, control);
if (_meter) {
_meter->ConfigurationChanged.connect (
if (_route) {
_route->active_changed.connect (model_connections, invalidator (*this), boost::bind (&GainMeter::route_active_changed, this), gui_context ());
+ hbox.pack_start (meter_hbox, true, true);
+ meter_hbox.show ();
}
- /*
- if we have a non-hidden route (ie. we're not the click or the auditioner),
- pack some route-dependent stuff.
- */
-
- hbox.pack_start (meter_hbox, true, true);
-
// if (r && !r->is_auditioner()) {
// fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
// }
- hbox.show_all ();
+ gain_display_box.show ();
+ gain_display.show ();
+ gain_slider->show ();
+ fader_vbox.show ();
+ fader_alignment.show ();
+ hbox.show ();
setup_meters ();
}
{
Gtk::Requisition sz;
int min_w = 0;
+ sz.width = 0;
meter_metric_area.size_request (sz);
min_w += sz.width;
level_meter->size_request (sz);
return meter_expose_ticks(ev, _route->meter_type(), _types, &meter_ticks2_area);
}
+void
+GainMeter::on_style_changed (const Glib::RefPtr<Gtk::Style>&)
+{
+ gain_display.queue_draw();
+ peak_display.queue_draw();
+}
+
boost::shared_ptr<PBD::Controllable>
GainMeterBase::get_controllable()
{
if (_amp) {
- return _amp->gain_control();
+ return _control;
} else {
return boost::shared_ptr<PBD::Controllable>();
}
bool
GainMeterBase::level_meter_button_press (GdkEventButton* ev)
{
- return LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+ return static_cast<bool>(LevelMeterButtonPress (ev)); /* EMIT SIGNAL */
}
void
setup_meters();
meter_clear_pattern_cache(4);
+ on_style_changed(Glib::RefPtr<Gtk::Style>());
}
void
projects / ardour.git / blobdiff