likely fix for crash in MidiBuffer::merge_in_place() due to unwarranted assumption...

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index f29f06ce94c9f872f833269c52c66da7c54c87c7..74eafbb064b62f628bb99155d6ab077c7ede2d6f 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -202,6 +202,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        AudioClock* primary_clock;
        AudioClock* secondary_clock;
+       void focus_on_clock ();
 
        TimeInfoBox* time_info_box;
 
@@ -355,6 +356,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void big_clock_realized ();
        bool big_clock_resize_in_progress;
        int  big_clock_height;
+       void big_clock_catch_focus ();
+       void big_clock_reset_aspect_ratio ();
 
        void float_big_clock (Gtk::Window* parent);
        bool main_window_state_event_handler (GdkEventWindowState*, bool window_was_editor);
@@ -414,8 +417,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        boost::shared_ptr<TransportControllable> auto_loop_controllable;
        boost::shared_ptr<TransportControllable> play_selection_controllable;
        boost::shared_ptr<TransportControllable> rec_controllable;
-       boost::shared_ptr<TransportControllable> shuttle_controllable;
-       boost::shared_ptr<TransportControllable> join_play_range_controllable;
+
+       void join_play_range_clicked ();
 
        void set_transport_controllable_state (const XMLNode&);
        XMLNode& get_transport_controllable_state ();
@@ -435,21 +438,22 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        ShuttleControl* shuttle_box;
 
-       Gtkmm2ext::StatefulToggleButton auto_return_button;
-       Gtkmm2ext::StatefulToggleButton auto_play_button;
-       Gtkmm2ext::StatefulToggleButton auto_input_button;
-       Gtkmm2ext::StatefulToggleButton click_button;
-       Gtkmm2ext::StatefulToggleButton time_master_button;
-       Gtkmm2ext::StatefulToggleButton sync_button;
+       ArdourButton auto_return_button;
+       ArdourButton auto_play_button;
+       ArdourButton auto_input_button;
+       ArdourButton click_button;
+       ArdourButton sync_button;
 
-       Gtk::ToggleButton auditioning_alert_button;
-       Gtk::ToggleButton solo_alert_button;
+       ArdourButton auditioning_alert_button;
+       ArdourButton solo_alert_button;
+       ArdourButton feedback_alert_button;
 
        Gtk::VBox alert_box;
 
        void solo_blink (bool);
        void sync_blink (bool);
        void audition_blink (bool);
+       void feedback_blink (bool);
 
        void soloing_changed (bool);
        void auditioning_changed (bool);
@@ -457,6 +461,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
        bool solo_alert_press (GdkEventButton* ev);
        bool audition_alert_press (GdkEventButton* ev);
+       bool feedback_alert_press (GdkEventButton *);
 
        void big_clock_value_changed ();
        void primary_clock_value_changed ();
@@ -504,27 +509,21 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
        void build_menu_bar ();
 
        Gtk::Label   wall_clock_label;
-       Gtk::EventBox wall_clock_box;
        gint update_wall_clock ();
 
        Gtk::Label   disk_space_label;
-       Gtk::EventBox disk_space_box;
        void update_disk_space ();
 
        Gtk::Label   cpu_load_label;
-       Gtk::EventBox cpu_load_box;
        void update_cpu_load ();
 
        Gtk::Label   buffer_load_label;
-       Gtk::EventBox buffer_load_box;
        void update_buffer_load ();
 
        Gtk::Label   sample_rate_label;
-       Gtk::EventBox sample_rate_box;
        void update_sample_rate (ARDOUR::framecnt_t);
 
        Gtk::Label    format_label;
-       Gtk::EventBox format_box;
        void update_format ();
        
        gint every_second ();
@@ -729,6 +728,16 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
         *  PluginEqGui::impulse_analysis ().
         */
        ARDOUR::ProcessThread* _process_thread;
+
+       void feedback_detected ();
+
+       ArdourButton             midi_panic_button;
+       void                     midi_panic ();
+
+       void successful_graph_sort ();
+       bool _feedback_exists;
+
+       void resize_text_widgets ();
 };
 
 #endif /* __ardour_gui_h__ */