#include "public_editor.h"
#include "utils.h"
#include "meter_patterns.h"
+#include "timers.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"
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);
+}
+
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 ("")
, _data_type (DataType::AUDIO)
-
{
using namespace Menu_Helpers;
_width = Wide;
if (horizontal) {
- gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, fader_girth));
+ 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));
+ 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");
set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */
max_peak = minus_infinity();
peak_display.set_text (_("-inf"));
- peak_display.unset_flags (Gtk::CAN_FOCUS);
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");
_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_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 (1));
} else {
_data_type = DataType::MIDI;
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;
+ _amp->gain_control()->start_touch (_amp->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;
}
gint
gain_watching.disconnect();
if (x) {
- gain_watching = ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
+ gain_watching = Timers::rapid_connect (sigc::mem_fun (*this, &GainMeterBase::effective_gain_display));
}
}
+const ChanCount
+GainMeterBase::meter_channels() const
+{
+ if (_meter) { return _meter->input_streams(); }
+ else { return ChanCount(); }
+}
void
GainMeterBase::update_meters()
{
peak_display.set_text (buf);
}
}
- if (mpeak >= Config->get_meter_peak()) {
+ if (mpeak >= ARDOUR_UI::config()->get_meter_peak()) {
peak_display.set_name ("MixerStripPeakDisplayPeak");
}
}
bool
GainMeterBase::level_meter_button_press (GdkEventButton* ev)
{
- return LevelMeterButtonPress (ev); /* EMIT SIGNAL */
+ return !!LevelMeterButtonPress (ev); /* EMIT SIGNAL */
}
void
projects / ardour.git / blobdiff