X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=cc00b0a16b6f716a85e100df2adce0815263c268;hb=4e411dfd7bab6793426979fe005faf2435c0df0d;hp=1561a0102ce6e4e99016c00d0b3b2bf613747fda;hpb=b9185d2c07c77eccf3679ac99f6b69f8fdd79c48;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 1561a0102c..cc00b0a16b 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -63,6 +63,7 @@
 #include "ardour/utils.h"
 #include "ardour/plugin.h"
 #include "ardour/session_handle.h"
+#include "ardour/system_exec.h"
 
 #include "video_timeline.h"
 
@@ -92,7 +93,6 @@
 #include "theme_manager.h"
 
 class VideoTimeLine;
-class SystemExec;
 class ArdourKeyboard;
 class AudioClock;
 class ButtonJoiner;
@@ -174,6 +174,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	void new_midi_tracer_window ();
 	void toggle_editing_space();
+	void toggle_mixer_space();
 	void toggle_keep_tearoffs();
 
 	Gtk::Tooltips& tooltips() { return _tooltips; }
@@ -189,6 +190,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	/** point_zero_something_seconds -- currently 25Hz ^= 40ms */
 	static sigc::signal<void>      SuperRapidScreenUpdate;
 
+	/** every_fps -- see set_fps_timeout_connection() 25Hz < x < 120Hz */
+	static sigc::signal<void>      FPSUpdate;
+
 	/** Emitted frequently with the audible frame, false, and the edit point as
 	 *  parameters respectively.
 	 *
@@ -276,6 +280,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void maximise_editing_space ();
 	void restore_editing_space ();
 
+	void show_ui_prefs ();
+
 	void update_tearoff_visibility ();
 
 	void setup_profile ();
@@ -423,7 +429,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	boost::shared_ptr<TransportControllable> play_selection_controllable;
 	boost::shared_ptr<TransportControllable> rec_controllable;
 
-	void toggle_always_play_range ();
+	void toggle_follow_edits ();
 
 	void set_transport_controllable_state (const XMLNode&);
 	XMLNode& get_transport_controllable_state ();
@@ -463,6 +469,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void sync_blink (bool);
 	void audition_blink (bool);
 	void feedback_blink (bool);
+	
+	void set_flat_buttons();
 
 	void soloing_changed (bool);
 	void auditioning_changed (bool);
@@ -506,7 +514,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	struct RecentSessionsSorter {
 		bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
-		    return cmp_nocase(a.first, b.first) == -1;
+		    return ARDOUR::cmp_nocase(a.first, b.first) == -1;
 	    }
 	};
 
@@ -543,10 +551,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	gint every_second ();
 	gint every_point_one_seconds ();
 	gint every_point_zero_something_seconds ();
+	gint every_fps ();
 
 	sigc::connection second_connection;
 	sigc::connection point_one_second_connection;
 	sigc::connection point_zero_something_second_connection;
+	sigc::connection fps_connection;
+
+	void set_fps_timeout_connection ();
 
 	void open_session ();
 	void open_recent_session ();
@@ -560,6 +572,15 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	void set_transport_sensitivity (bool);
 
+	//stuff for ProTools-style numpad
+	void transport_numpad_event (int num);
+	void transport_numpad_decimal ();
+	bool _numpad_locate_happening;
+	int _pending_locate_num;
+	gint transport_numpad_timeout ();
+	sigc::connection _numpad_timeout_connection;
+
+	void transport_goto_nth_marker (int nth);
 	void transport_goto_zero ();
 	void transport_goto_start ();
 	void transport_goto_end ();
@@ -573,6 +594,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void transport_rewind (int option);
 	void transport_loop ();
 	void toggle_roll (bool with_abort, bool roll_out_of_bounded_mode);
+	bool trx_record_enable_all_tracks ();
 
 	bool _session_is_new;
 	void set_session (ARDOUR::Session *);
@@ -626,7 +648,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
 	static UIConfiguration *ui_config;
 
-	SystemExec *video_server_process;
+	ARDOUR::SystemExec *video_server_process;
 
 	void handle_locations_change (ARDOUR::Location*);
 
@@ -666,6 +688,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*);
 	void disk_overrun_handler ();
 	void disk_underrun_handler ();
+	void gui_idle_handler ();
+
+	void cancel_plugin_scan ();
+	void cancel_plugin_timeout ();
+	void plugin_scan_dialog (std::string type, std::string plugin, bool);
+	void plugin_scan_timeout (int);
 
         void session_format_mismatch (std::string, std::string);