Merged with trunk R874.

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index bca41f6ca7c65e721c44ab5ed4db4a19537f8ca8..d0e90c42bebc9ff75785df00e5c6d935aa51e0b1 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;
@@ -80,18 +79,19 @@ class ColorManager;
 
 namespace Gtkmm2ext {
        class TearOff;
-};
+}
 
 namespace ARDOUR {
        class AudioEngine;
        class Route;
        class Port;
        class IO;
-};
+       class ControlProtocolInfo;
+}
 
 namespace ALSA {
        class MultiChannelDevice;
-};
+}
 
 #define FRAME_NAME "BaseFrame"
 
@@ -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);
@@ -191,15 +189,21 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
        void add_route ();
        
-       void session_add_audio_track (int input_channels, int32_t output_channels, ARDOUR::TrackMode mode) {
-               session_add_audio_route (true, input_channels, output_channels, mode);
+       void session_add_audio_track (int input_channels, int32_t output_channels, ARDOUR::TrackMode mode, uint32_t how_many) {
+               session_add_audio_route (true, input_channels, output_channels, mode, how_many);
        }
 
-       void session_add_audio_bus (int input_channels, int32_t output_channels) {
-               session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal);
+       void session_add_audio_bus (int input_channels, int32_t output_channels, uint32_t how_many) {
+               session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, how_many);
        }
 
-       void session_add_midi_track ();
+       void session_add_midi_track (uint32_t how_many) {
+               session_add_midi_route (true, how_many);
+       }
+
+       /*void session_add_midi_bus () {
+               session_add_midi_route (false);
+       }*/
 
        void set_engine (ARDOUR::AudioEngine&);
 
@@ -427,7 +431,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::ToggleButton solo_alert_button;
 
        Gtk::VBox alert_box;
-       
+
        void solo_blink (bool);
        void audition_blink (bool);
 
@@ -491,6 +495,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 +510,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,14 +526,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        sigc::connection point_one_second_connection;
        sigc::connection point_zero_one_second_connection;
 
-       void diskstream_added (ARDOUR::DiskStream*);
-
        gint session_menu (GdkEventButton *);
 
        bool _will_create_new_session_automatically;
 
-       GladeRef m_new_session_dialog_ref;
-       NewSessionDialog* m_new_session_dialog;
+       NewSessionDialog* new_session_dialog;
        
        void open_session ();
        void open_recent_session ();
@@ -540,14 +538,9 @@ 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, uint32_t how_many);
+       void session_add_midi_route (bool disk, uint32_t how_many);
 
-       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 ();
@@ -630,11 +623,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        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::Route&);
 
        About* about;
        bool shown_flag;
@@ -653,9 +645,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<boost::shared_ptr<ARDOUR::Source> >*);
 
        void editor_display_control_changed (Editing::DisplayControl c);
 
@@ -718,8 +708,9 @@ 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*);
+};
 
 #endif /* __ardour_gui_h__ */
+