diff options
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 23 | ||||
| -rw-r--r-- | gtk2_ardour/icons/fader_belt.png | bin | 0 -> 568 bytes | |||
| -rw-r--r-- | gtk2_ardour/icons/gain_fader_base.png | bin | 359 -> 0 bytes | |||
| -rw-r--r-- | gtk2_ardour/icons/gain_fader_handle.png | bin | 354 -> 0 bytes |
4 files changed, 2 insertions, 21 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index aaa1368eea..fad0becd54 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -62,26 +62,7 @@ map<string,Glib::RefPtr<Gdk::Pixmap> > GainMeter::metric_pixmaps; int GainMeter::setup_slider_pix () { -#if 0 - string path = ARDOUR::find_data_file("vslider02_slider.xpm", "pixmaps"); - if (path.empty()) { - error << _("cannot find images for fader slider") << endmsg; - return -1; - } - slider = Gdk::Pixbuf::create_from_file (path); -#endif - slider = ::get_icon ("gain_fader_handle"); - -#if 0 - path = ARDOUR::find_data_file("vslider02_rail.xpm", "pixmaps"); - if (path.empty()) { - error << _("cannot find images for fader rail") << endmsg; - return -1; - } - rail = Gdk::Pixbuf::create_from_file (path); -#endif - rail = ::get_icon ("gain_fader_base"); - + slider = ::get_icon ("fader_belt"); return 0; } @@ -103,7 +84,7 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s) ignore_toggle = false; meter_menu = 0; - gain_slider = manage (new VSliderController (slider, rail, + gain_slider = manage (new VSliderController (slider, &gain_adjustment, _io->gain_control(), false)); diff --git a/gtk2_ardour/icons/fader_belt.png b/gtk2_ardour/icons/fader_belt.png Binary files differnew file mode 100644 index 0000000000..292a966f30 --- /dev/null +++ b/gtk2_ardour/icons/fader_belt.png diff --git a/gtk2_ardour/icons/gain_fader_base.png b/gtk2_ardour/icons/gain_fader_base.png Binary files differdeleted file mode 100644 index f8f59ffc0d..0000000000 --- a/gtk2_ardour/icons/gain_fader_base.png +++ /dev/null diff --git a/gtk2_ardour/icons/gain_fader_handle.png b/gtk2_ardour/icons/gain_fader_handle.png Binary files differdeleted file mode 100644 index b86172f8d9..0000000000 --- a/gtk2_ardour/icons/gain_fader_handle.png +++ /dev/null |
