diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-10 15:25:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-10 15:25:11 +0000 |
| commit | b1029a3caf4153835b7faa8e1a689f4f4a05622b (patch) | |
| tree | 3803271511ae9bf3f528b96b01dbb842233641ae /gtk2_ardour/gain_meter.cc | |
| parent | 31172d0c71d56db3e0ae7dac3ea21e731e80cedf (diff) | |
goodbye pixmaps and pixbufs (no longer) used by Gtkmm2ext::PixFader
git-svn-id: svn://localhost/ardour2/branches/3.0@13827 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 5fe3847e6f..9436596afa 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -61,27 +61,8 @@ sigc::signal<void> GainMeterBase::ResetAllPeakDisplays; sigc::signal<void,RouteGroup*> GainMeterBase::ResetGroupPeakDisplays; GainMeter::MetricPatterns GainMeter::metric_patterns; -Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider; -Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider_desensitised; - -void -GainMeter::setup_slider_pix () -{ - if ((slider = ::get_icon ("fader_belt")) == 0) { - throw failed_constructor(); - } - - if ((slider_desensitised = ::get_icon ("fader_belt_desensitised")) == 0) { - throw failed_constructor(); - } -} - -GainMeterBase::GainMeterBase (Session* s, - const Glib::RefPtr<Gdk::Pixbuf>& pix, - const Glib::RefPtr<Gdk::Pixbuf>& pix_desensitised, - bool horizontal, - int fader_length) +GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length) : gain_adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0.0, 1.0, 0.01, 0.1) , gain_automation_style_button ("") , gain_automation_state_button ("") @@ -100,17 +81,9 @@ GainMeterBase::GainMeterBase (Session* s, _width = Wide; if (horizontal) { - gain_slider = manage (new HSliderController (pix, - pix_desensitised, - &gain_adjustment, - fader_length, - false)); + gain_slider = manage (new HSliderController (&gain_adjustment, fader_length, false)); } else { - gain_slider = manage (new VSliderController (pix, - pix_desensitised, - &gain_adjustment, - fader_length, - false)); + gain_slider = manage (new VSliderController (&gain_adjustment, fader_length, false)); } level_meter = new LevelMeter(_session); @@ -881,7 +854,7 @@ GainMeterBase::on_theme_changed() } GainMeter::GainMeter (Session* s, int fader_length) - : GainMeterBase (s, slider, slider_desensitised, false, fader_length) + : GainMeterBase (s, false, fader_length) , gain_display_box(true, 0) , hbox(true, 2) { |