X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=d0e90c42bebc9ff75785df00e5c6d935aa51e0b1;hb=5169a66f35508dfeee8e5f9486788843d229295a;hp=c6e9a4546e9015df4f360034aa2aa187257c24fc;hpb=e1ad4e0a532b10e78b6286537e8b0ec1142fcf6b;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index c6e9a4546e..d0e90c42be 100644
--- 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;
@@ -76,21 +75,23 @@ class About;
 class AddRouteDialog;
 class NewSessionDialog;
 class LocationUI;
+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"
 
@@ -128,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 = "");
@@ -146,14 +147,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	Mixer_UI* the_mixer() { return mixer; }
 	
 	void toggle_location_window ();
+	void toggle_color_manager ();
 	void toggle_big_clock_window ();
 	void toggle_connection_editor ();
 	void toggle_route_params_window ();
 	void toggle_tempo_window ();
 	void toggle_editing_space();
 
-	gint32 select_diskstream (GdkEventButton *ev);
-
 	Gtk::Tooltips& tooltips() { return _tooltips; }
 
 	static sigc::signal<void,bool> Blink;
@@ -165,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);
@@ -189,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, uint32_t how_many) {
+		session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, 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_midi_track (uint32_t how_many) {
+		session_add_midi_route (true, how_many);
 	}
 
-	void session_add_midi_track ();
+	/*void session_add_midi_bus () {
+		session_add_midi_route (false);
+	}*/
 
 	void set_engine (ARDOUR::AudioEngine&);
 
@@ -206,6 +212,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void maximise_editing_space ();
 	void restore_editing_space ();
 
+	void set_native_file_header_format (ARDOUR::HeaderFormat sf);
+	void set_native_file_data_format (ARDOUR::SampleFormat sf);
+
   protected:
 	friend class PublicEditor;
 
@@ -303,6 +312,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void engine_stopped ();
 	void engine_running ();
 
+	void use_config ();
+
 	void clear_meters ();
 
 	static gint _blink  (void *);
@@ -386,16 +397,22 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	Gtk::Menu*        shuttle_style_menu;
 	ShuttleBehaviour  shuttle_behaviour;
 	ShuttleUnits      shuttle_units;
+	float             shuttle_max_speed;
+	Gtk::Menu*        shuttle_context_menu;
 
+	void build_shuttle_context_menu ();
+	void show_shuttle_context_menu ();
 	void shuttle_style_changed();
 	void shuttle_unit_clicked ();
 	void set_shuttle_behaviour (ShuttleBehaviour);
 	void set_shuttle_units (ShuttleUnits);
+	void set_shuttle_max_speed (float);
 	void update_speed_display ();
 	float last_speed_displayed;
 
 	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);
@@ -414,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);
 
@@ -463,6 +480,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void build_session_selector();
 	void recent_session_selection_changed ();
 	void redisplay_recent_sessions();
+	void recent_session_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col);
 
 	struct RecentSessionsSorter {
 	    bool operator() (std::pair<string,string> a, std::pair<string,string> b) const {
@@ -477,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;
@@ -491,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 ();
@@ -511,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 ();
@@ -526,18 +538,14 @@ 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 ();
 
+	void transport_goto_zero ();
 	void transport_goto_start ();
 	void transport_goto_end ();
 	void transport_stop ();
@@ -562,7 +570,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;
 
@@ -585,6 +594,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	LocationUI *location_ui;
 	int         create_location_ui ();
+	void        handle_locations_change (ARDOUR::Location*);
+
+	ColorManager* color_manager;
 
 	/* Options window */
 	
@@ -606,17 +618,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::Route&);
 
 	About* about;
 	bool shown_flag;
@@ -635,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);
 
@@ -700,7 +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__ */
+