X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=bf9a88d29e8ff433d05475ca3349797a4259bc1a;hb=6e904b1e1600f4ccc0338d0b0864f7e02d417b13;hp=47be382f46cebece48f5349944efc77104bc8a57;hpb=7689d72875e77e15c87f6c49e8a509cd37925435;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 47be382f46..bf9a88d29e 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -67,6 +67,7 @@ #include "ardour_dialog.h" #include "editing.h" #include "ui_config.h" +#include "window_proxy.h" class About; class AddRouteDialog; @@ -84,6 +85,9 @@ class RouteParams_UI; class SessionOptionEditor; class Splash; class ThemeManager; +class MidiTracer; +class WindowProxyBase; +class GlobalPortMatrixWindow; namespace Gtkmm2ext { class TearOff; @@ -107,15 +111,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ARDOUR_UI (int *argcp, char **argvp[]); ~ARDOUR_UI(); - bool run_startup (bool should_be_new); - - void show (); - bool shown() { return shown_flag; } + bool run_startup (bool should_be_new, std::string load_template); void show_splash (); void hide_splash (); void launch_chat (); + void launch_manual (); + void launch_reference (); void show_about (); void hide_about (); @@ -124,13 +127,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr int load_session (const Glib::ustring& path, const Glib::ustring& snapshot, Glib::ustring mix_template = Glib::ustring()); bool session_loaded; - int build_session (const Glib::ustring& path, const Glib::ustring& snapshot, - uint32_t master_chns, - ARDOUR::AutoConnectOption input_connect, - ARDOUR::AutoConnectOption output_connect, - uint32_t nphysin, - uint32_t nphysout, - nframes_t initial_length); + int build_session (const Glib::ustring& path, const Glib::ustring& snapshot, ARDOUR::BusProfile&); bool session_is_new() const { return _session_is_new; } ARDOUR::Session* the_session() { return _session; } @@ -143,7 +140,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr _will_create_new_session_automatically = yn; } - int get_session_parameters (bool quit_on_cancel, bool should_be_new = false); + int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = ""); void parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session); int load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session); int build_session_from_nsd (const Glib::ustring& session_name, const Glib::ustring& session_path); @@ -153,8 +150,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr int unload_session (bool hide_stuff = false); void close_session(); - int save_state_canfail (std::string state_name = ""); - void save_state (const std::string & state_name = ""); + int save_state_canfail (std::string state_name = "", bool switch_to_it = false); + void save_state (const std::string & state_name = "", bool switch_to_it = false); static double gain_to_slider_position (ARDOUR::gain_t g); static ARDOUR::gain_t slider_position_to_gain (double pos); @@ -170,8 +167,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void toggle_theme_manager (); void toggle_bundle_manager (); void toggle_big_clock_window (); + void new_midi_tracer_window (); void toggle_route_params_window (); void toggle_editing_space(); + void toggle_keep_tearoffs(); Gtk::Tooltips& tooltips() { return _tooltips; } @@ -234,6 +233,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void set_shuttle_fract (double); + void add_window_proxy (WindowProxyBase *); + void remove_window_proxy (WindowProxyBase *); + protected: friend class PublicEditor; @@ -288,7 +290,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void map_transport_state (); int32_t do_engine_start (); - void engine_halted (); + void engine_halted (const char* reason, bool free_reason); void engine_stopped (); void engine_running (); @@ -314,7 +316,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void manage_window (Gtk::Window&); AudioClock big_clock; - Gtk::Window* big_clock_window; + ActionWindowProxy* big_clock_window; int original_big_clock_width; int original_big_clock_height; double original_big_clock_font_size; @@ -331,6 +333,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void update_transport_clocks (nframes_t pos); void record_state_changed (); + std::list _midi_tracer_windows; + /* Transport Control */ void detach_tearoff (Gtk::Box* parent, Gtk::Widget* contents); @@ -369,8 +373,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr }; TransportControllable (std::string name, ARDOUR_UI&, ToggleType); - void set_value (float); - float get_value (void) const; + void set_value (double); + double get_value (void) const; void set_id (const std::string&); @@ -573,7 +577,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr guint32 last_key_press_time; - void snapshot_session (); + void snapshot_session (bool switch_to_it); Mixer_UI *mixer; int create_mixer (); @@ -587,10 +591,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr BundleManager *bundle_manager; void create_bundle_manager (); - LocationUIWindow *location_ui; + ActionWindowProxy* location_ui; int create_location_ui (); void handle_locations_change (ARDOUR::Location*); + ActionWindowProxy* _global_port_matrix[ARDOUR::DataType::num_types]; + void toggle_global_port_matrix (ARDOUR::DataType); + static UIConfiguration *ui_config; ThemeManager *theme_manager; @@ -624,7 +631,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr About* about; Splash* splash; void pop_back_splash (); - bool shown_flag; /* cleanup */ @@ -642,19 +648,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ARDOUR::microseconds_t last_peak_grab; ARDOUR::microseconds_t last_shuttle_request; - struct DiskBufferStat { - time_t when; - uint32_t capture; - uint32_t playback; - - DiskBufferStat (time_t w, uint32_t c, uint32_t p) - : when (w), capture (c), playback (p) {} - }; - - std::list disk_buffer_stats; - void push_buffer_stats (uint32_t, uint32_t); - void write_buffer_stats (); - bool have_disk_speed_dialog_displayed; void disk_speed_dialog_gone (int ignored_response, Gtk::MessageDialog*); void disk_overrun_handler (); @@ -700,6 +693,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Glib::RefPtr ptag, Glib::RefPtr mtag, const char *msg); Gtk::Label status_bar_label; + bool status_bar_button_press (GdkEventButton*); Gtk::ToggleButton error_log_button; void loading_message (const std::string& msg); @@ -708,8 +702,18 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void platform_specific (); void platform_setup (); void fontconfig_dialog (); + void toggle_translations (); PBD::ScopedConnectionList forever_connections; + + void step_edit_status_change (bool); + + /* these are used only in response to a platform-specific "ShouldQuit" signal + */ + bool idle_finish (); + void queue_finish (); + + std::list _window_proxies; }; #endif /* __ardour_gui_h__ */