id_t becomes a fully-fledged object, UUID's used for IDs, generic MIDI now owns bindi...

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 8e1bfc141411a66b12441965899a20e7fd7b7132..e9fae63677c87b8c4320d823eeff57ad54263fb9 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -61,7 +61,6 @@
 #include "audio_clock.h"
 #include "ardour_dialog.h"
 #include "editing.h"
-#include "glade_factory.h"
 
 class AudioClock;
 class PublicEditor;
@@ -87,6 +86,7 @@ namespace ARDOUR {
        class Route;
        class Port;
        class IO;
+       class ControlProtocolInfo;
 };
 
 namespace ALSA {
@@ -129,10 +129,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI
                _will_create_new_session_automatically = yn;
        }
 
-       void new_session(bool startup = false, std::string path = string());
+        void new_session(bool startup = false, std::string path = string());
        gint cmdline_new_session (string path);
        int  unload_session ();
-       void close_session() { unload_session(); }
+       void close_session(); 
 
        int  save_state_canfail (string state_name = "");
        void save_state (const string & state_name = "");
@@ -154,8 +154,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_tempo_window ();
        void toggle_editing_space();
 
-       gint32 select_diskstream (GdkEventButton *ev);
-
        Gtk::Tooltips& tooltips() { return _tooltips; }
 
        static sigc::signal<void,bool> Blink;
@@ -167,7 +165,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
           blinking rec-enable buttons.
        */
 
-       void rec_enable_button_blink (bool onoff, ARDOUR::DiskStream *, Gtk::Widget *w);
+       void rec_enable_button_blink (bool onoff, ARDOUR::AudioDiskstream *, Gtk::Widget *w);
 
        void name_io_setup (ARDOUR::AudioEngine&, string&, ARDOUR::IO& io, bool in);
        void choose_io (ARDOUR::IO&, bool input);
@@ -408,6 +406,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        gint shuttle_box_button_press (GdkEventButton*);
        gint shuttle_box_button_release (GdkEventButton*);
+       gint shuttle_box_scroll (GdkEventScroll*);
        gint shuttle_box_motion (GdkEventMotion*);
        gint shuttle_box_expose (GdkEventExpose*);
        gint mouse_shuttle (double x, bool force);
@@ -490,6 +489,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::HBox     menu_hbox;
 
        void build_menu_bar ();
+       void build_control_surface_menu ();
        void pack_toplevel_controls();
 
        Gtk::Label   wall_clock_label;
@@ -504,10 +504,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::EventBox cpu_load_box;
        void update_cpu_load ();
 
-       Gtk::Label   disk_rate_label;
-       Gtk::EventBox disk_rate_box;
-       void update_disk_rate();
-
        Gtk::Label   buffer_load_label;
        Gtk::EventBox buffer_load_box;
        void update_buffer_load ();
@@ -524,13 +520,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        sigc::connection point_one_second_connection;
        sigc::connection point_zero_one_second_connection;
 
-       void diskstream_added (ARDOUR::DiskStream*);
+       void diskstream_added (ARDOUR::AudioDiskstream*);
 
        gint session_menu (GdkEventButton *);
 
        bool _will_create_new_session_automatically;
 
-       GladeRef m_new_session_dialog_ref;
        NewSessionDialog* m_new_session_dialog;
        
        void open_session ();
@@ -539,14 +534,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void save_template ();
 
-
        void session_add_audio_route (bool disk, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode);
 
-       void add_diskstream_to_menu (ARDOUR::DiskStream&);
-       void diskstream_selected (gint32);
-       Gtk::Menu *diskstream_menu;
-       gint32 selected_dstream;
-       
        void set_transport_sensitivity (bool);
 
        void remove_last_capture ();
@@ -576,7 +565,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void connect_dependents_to_session (ARDOUR::Session *);
        void we_have_dependents ();
        void setup_keybindings ();
-       void setup_options ();
+       void setup_session_options ();
+       void setup_config_options ();
        
        guint32  last_key_press_time;
 
@@ -623,17 +613,15 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        /* Keymap handling */
 
-       void install_keybindings ();
        Glib::RefPtr<Gtk::ActionGroup> get_common_actions();
        void install_actions ();
        void test_binding_action (const char *);
        void start_keyboard_prefix();
 
-       void toggle_record_enable (guint32);
-       void toggle_monitor_enable (guint32);
+       void toggle_record_enable (uint32_t);
 
        uint32_t rec_enabled_diskstreams;
-       void count_recenabled_diskstreams (ARDOUR::DiskStream&);
+       void count_recenabled_diskstreams (ARDOUR::AudioDiskstream&);
 
        About* about;
        bool shown_flag;
@@ -652,9 +640,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        struct timeval last_peak_grab;
        struct timeval last_shuttle_request;
 
-       void cannot_record_no_input (ARDOUR::DiskStream*);
-
-       void delete_sources_in_the_right_thread (list<ARDOUR::Source*>*);
+       void delete_sources_in_the_right_thread (list<ARDOUR::AudioFileSource*>*);
 
        void editor_display_control_changed (Editing::DisplayControl c);
 
@@ -717,7 +703,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void map_some_session_state (const char* group, const char* action, bool (ARDOUR::Session::*get)() const);
        void queue_session_control_changed (ARDOUR::Session::ControlType t);
        void session_control_changed (ARDOUR::Session::ControlType t);
-       
+
+       void toggle_control_protocol (ARDOUR::ControlProtocolInfo*);
 };