rename latched solo option and reverse its meaning; add exclusive solo button functio...

[ardour.git] / gtk2_ardour / route_ui.h

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 12a1cde7036549965e2576cf92c409b6e9408c7d..1dae38d9d9d4f6083b47088db67539f1bbf41082 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -69,8 +69,6 @@ class RouteUI : public virtual AxisView
        boost::shared_ptr<ARDOUR::AudioTrack> audio_track() const;
        boost::shared_ptr<ARDOUR::MidiTrack>  midi_track() const;
 
-       boost::shared_ptr<ARDOUR::Diskstream> get_diskstream() const;
-
        std::string name() const;
 
        // protected: XXX sigh this should be here
@@ -85,6 +83,7 @@ class RouteUI : public virtual AxisView
        bool multiple_mute_change;
        bool multiple_solo_change;
 
+       BindableToggleButton* invert_button;
        BindableToggleButton* mute_button;
        BindableToggleButton* solo_button;
        BindableToggleButton* rec_enable_button; /* audio tracks */
@@ -92,6 +91,7 @@ class RouteUI : public virtual AxisView
 
        Gtk::Label solo_button_label;
        Gtk::Label mute_button_label;
+       Gtk::Label invert_button_label;
        Gtk::Label rec_enable_button_label;
 
        void send_blink (bool);
@@ -104,12 +104,12 @@ class RouteUI : public virtual AxisView
        Gtk::Menu* solo_menu;
        Gtk::Menu* sends_menu;
 
-
        XMLNode *xml_node;
        void ensure_xml_node ();
 
        virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter param);
 
+       void invert_toggled();
        bool mute_press(GdkEventButton*);
        bool mute_release(GdkEventButton*);
        bool solo_press(GdkEventButton*);
@@ -131,7 +131,7 @@ class RouteUI : public virtual AxisView
        void create_sends (ARDOUR::Placement);
        void create_selected_sends (ARDOUR::Placement);
 
-       void solo_changed(void*);
+       void solo_changed(bool, void*);
        void solo_changed_so_update_mute ();
        void mute_changed(void*);
        void listen_changed(void*);
@@ -151,6 +151,8 @@ class RouteUI : public virtual AxisView
        Gtk::CheckMenuItem* post_fader_mute_check;
        Gtk::CheckMenuItem* listen_mute_check;
        Gtk::CheckMenuItem* main_mute_check;
+       Gtk::CheckMenuItem* solo_safe_check;
+       Gtk::CheckMenuItem* solo_isolated_check;
 
        void toggle_mute_menu(ARDOUR::MuteMaster::MutePoint, Gtk::CheckMenuItem*);
        void muting_change ();
@@ -164,15 +166,13 @@ class RouteUI : public virtual AxisView
 
        void route_rename();
 
-       virtual void name_changed ();
+       virtual void property_changed (const PBD::PropertyChange&);
        void route_removed ();
 
        Gtk::CheckMenuItem *route_active_menu_item;
        void toggle_route_active ();
        virtual void route_active_changed ();
 
-       Gtk::CheckMenuItem *polarity_menu_item;
-       void toggle_polarity ();
        virtual void polarity_changed ();
 
        Gtk::CheckMenuItem *denormal_menu_item;
@@ -196,6 +196,7 @@ class RouteUI : public virtual AxisView
        static int solo_visual_state (boost::shared_ptr<ARDOUR::Route>);
        static int solo_visual_state_with_isolate (boost::shared_ptr<ARDOUR::Route>);
        static int solo_isolate_visual_state (boost::shared_ptr<ARDOUR::Route>);
+       static int solo_safe_visual_state (boost::shared_ptr<ARDOUR::Route>);
        static int mute_visual_state (ARDOUR::Session*, boost::shared_ptr<ARDOUR::Route>);
 
    protected:
@@ -205,7 +206,6 @@ class RouteUI : public virtual AxisView
        void init ();
        void reset ();
 
-       void queue_route_group_op (ARDOUR::RouteGroup::Property prop, void (ARDOUR::Session::*session_method)(boost::shared_ptr<ARDOUR::RouteList>, bool), bool yn);
        void self_delete ();
 
   private: