Merged with trunk R846

[ardour.git] / gtk2_ardour / ardour_ui.h

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 34c3d65286289c5628da8f8580cabf387e3fa4ff..1f5277b5fee6633732661fa4082a7682c135ca40 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -79,7 +79,7 @@ class ColorManager;
 
 namespace Gtkmm2ext {
        class TearOff;
-};
+}
 
 namespace ARDOUR {
        class AudioEngine;
@@ -87,11 +87,11 @@ namespace ARDOUR {
        class Port;
        class IO;
        class ControlProtocolInfo;
-};
+}
 
 namespace ALSA {
        class MultiChannelDevice;
-};
+}
 
 #define FRAME_NAME "BaseFrame"
 
@@ -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;
@@ -191,21 +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 () {
-               session_add_midi_route (true);
+       void session_add_midi_track (uint32_t how_many) {
+               session_add_midi_route (true, how_many);
        }
 
-       void session_add_midi_bus () {
+       /*void session_add_midi_bus () {
                session_add_midi_route (false);
-       }
+       }*/
 
        void set_engine (ARDOUR::AudioEngine&);
 
@@ -528,8 +526,6 @@ 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;
@@ -542,15 +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 session_add_midi_route (bool disk);
-
-       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 ();
@@ -633,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;
@@ -656,7 +645,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        struct timeval last_peak_grab;
        struct timeval last_shuttle_request;
 
-       void delete_sources_in_the_right_thread (list<ARDOUR::AudioFileSource*>*);
+       void delete_sources_in_the_right_thread (list<ARDOUR::Source*>*);
 
        void editor_display_control_changed (Editing::DisplayControl c);
 
@@ -723,5 +712,5 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void toggle_control_protocol (ARDOUR::ControlProtocolInfo*);
 };
 
-
 #endif /* __ardour_gui_h__ */
+