From 5d652dd9c4634f9cabbed3ecbbc050818965eb5a Mon Sep 17 00:00:00 2001 From: Len Ovens Date: Tue, 27 Aug 2019 10:15:39 -0700 Subject: [PATCH] removed axis view from foldback strip --- gtk2_ardour/foldback_strip.cc | 17 +---------------- gtk2_ardour/foldback_strip.h | 9 +-------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc index 209b93418c..5825984434 100644 --- a/gtk2_ardour/foldback_strip.cc +++ b/gtk2_ardour/foldback_strip.cc @@ -483,8 +483,6 @@ FoldbackStrip::set_route (boost::shared_ptr rt) _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&FoldbackStrip::setup_comment_button, this), gui_context()); - set_stuff_from_route (); - /* now force an update of all the various elements */ update_mute_display (); @@ -507,7 +505,6 @@ FoldbackStrip::set_route (boost::shared_ptr rt) mute_solo_table.show(); bottom_button_table.show(); show_sends_box.show_all(); - //send_scroller.show (); send_display.show (); output_button.show(); name_button.show(); @@ -559,22 +556,10 @@ FoldbackStrip::processors_changed (RouteProcessorChange) update_send_box (); } -void -FoldbackStrip::set_stuff_from_route () -{ - /* if width is not set, it will be set by the MixerUI or editor */ - - Width width; - if (get_gui_property ("strip-width", width)) { -// set_width_enum (width, this); - } -} - void FoldbackStrip::set_packed (bool yn) { _packed = yn; - set_gui_property ("visible", _packed); } @@ -1253,7 +1238,7 @@ FoldbackStrip::list_fb_routes () void FoldbackStrip::set_selected (bool yn) { - AxisView::set_selected (yn); + //AxisView::set_selected (yn); if (selected()) { global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT); diff --git a/gtk2_ardour/foldback_strip.h b/gtk2_ardour/foldback_strip.h index dc73292cea..6ed4e815fb 100644 --- a/gtk2_ardour/foldback_strip.h +++ b/gtk2_ardour/foldback_strip.h @@ -45,12 +45,10 @@ #include "widgets/ardour_button.h" #include "widgets/ardour_knob.h" -#include "axis_view.h" #include "route_ui.h" #include "panner_ui.h" #include "enums.h" #include "processor_box.h" -//#include "visibility_group.h" #include "processor_selection.h" namespace ARDOUR { @@ -104,7 +102,7 @@ private: }; -class FoldbackStrip : public AxisView, public RouteUI, public Gtk::EventBox +class FoldbackStrip : public RouteUI, public Gtk::EventBox { public: FoldbackStrip (Mixer_UI&, ARDOUR::Session*, boost::shared_ptr); @@ -145,7 +143,6 @@ public: std::string state_id() const; -// void parameter_changed (std::string); void route_active_changed (); void copy_processors (); @@ -166,8 +163,6 @@ protected: void set_packed (bool yn); bool packed () { return _packed; } - void set_stuff_from_route (); - private: Mixer_UI& _mixer; void init (); @@ -271,8 +266,6 @@ private: void engine_running(); void engine_stopped(); -// virtual void bus_send_display_changed (boost::shared_ptr); - void set_current_delivery (boost::shared_ptr); void drop_send ();