diff options
author | Robin Gareus <robin@gareus.org> | 2014-11-18 02:09:09 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-11-18 02:15:06 +0100 |
commit | bd5713f009a2dcc669e98a85063fecdf95bf409f (patch) | |
tree | 45f28e183308fdffea18a311b9b5464e6b22bcf2 /gtk2_ardour | |
parent | f39286f92f994a3b5b79ef19cce07fa96269a517 (diff) |
remove cruft (monitor section knobs are cairo now)
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/monitor_section.cc | 41 | ||||
-rw-r--r-- | gtk2_ardour/monitor_section.h | 4 |
3 files changed, 0 insertions, 47 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 474d2c00a2..626d2f68a8 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -246,8 +246,6 @@ Mixer_UI::Mixer_UI () MixerStrip::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&Mixer_UI::remove_strip, this, _1), gui_context()); - MonitorSection::setup_knob_images (); - #ifndef DEFER_PLUGIN_SELECTOR_LOAD _plugin_selector = new PluginSelector (PluginManager::instance ()); #endif diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 7f518b4bf6..d92b9e96a3 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -50,8 +50,6 @@ using namespace PBD; using namespace std; Glib::RefPtr<ActionGroup> MonitorSection::monitor_actions; -Glib::RefPtr<Gdk::Pixbuf> MonitorSection::big_knob_pixbuf; -Glib::RefPtr<Gdk::Pixbuf> MonitorSection::little_knob_pixbuf; MonitorSection::MonitorSection (Session* s) : AxisView (s) @@ -872,45 +870,6 @@ MonitorSection::solo_use_pfl () } void -MonitorSection::setup_knob_images () -{ - - try { - uint32_t c = ARDOUR_UI::config()->color_by_name ("monitor knob"); - char buf[16]; - snprintf (buf, 16, "#%x", (c >> 8)); - MotionFeedback::set_lamp_color (buf); - big_knob_pixbuf = MotionFeedback::render_pixbuf (80); - - } catch (...) { - - error << "No usable large knob image" << endmsg; - throw failed_constructor (); - } - - if (!big_knob_pixbuf) { - error << "No usable large knob image" << endmsg; - throw failed_constructor (); - } - - try { - - little_knob_pixbuf = MotionFeedback::render_pixbuf (30); - - } catch (...) { - - error << "No usable small knob image" << endmsg; - throw failed_constructor (); - } - - if (!little_knob_pixbuf) { - error << "No usable small knob image" << endmsg; - throw failed_constructor (); - } - -} - -void MonitorSection::update_solo_model () { if (_inhibit_solo_model_update) { diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h index 30072d1f77..65023aa667 100644 --- a/gtk2_ardour/monitor_section.h +++ b/gtk2_ardour/monitor_section.h @@ -43,7 +43,6 @@ class MonitorSection : public RouteUI ~MonitorSection (); void set_session (ARDOUR::Session*); - static void setup_knob_images (); Gtkmm2ext::TearOff& tearoff() const { return *_tearoff; } @@ -95,9 +94,6 @@ class MonitorSection : public RouteUI static Glib::RefPtr<Gtk::ActionGroup> monitor_actions; void register_actions (); - static Glib::RefPtr<Gdk::Pixbuf> big_knob_pixbuf; - static Glib::RefPtr<Gdk::Pixbuf> little_knob_pixbuf; - void cut_channel (uint32_t); void dim_channel (uint32_t); void solo_channel (uint32_t); |