Merged with trunk revision 600

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index bca41f6ca7c65e721c44ab5ed4db4a19537f8ca8..678342f32bb6ad683ff64a1dead56dfa9110dec1 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 = "");
@@ -167,7 +167,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);
@@ -491,6 +491,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;
@@ -505,10 +506,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 ();
@@ -525,13 +522,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 ();
@@ -543,7 +539,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        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 add_diskstream_to_menu (ARDOUR::AudioDiskstream&);
        void diskstream_selected (gint32);
        Gtk::Menu *diskstream_menu;
        gint32 selected_dstream;
@@ -634,7 +630,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_monitor_enable (guint32);
 
        uint32_t rec_enabled_diskstreams;
-       void count_recenabled_diskstreams (ARDOUR::DiskStream&);
+       void count_recenabled_diskstreams (ARDOUR::AudioDiskstream&);
 
        About* about;
        bool shown_flag;
@@ -653,9 +649,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);
 
@@ -718,7 +712,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*);
 };