X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=08e0d42ab089dec16bca6350c5e6dce12079fba7;hb=c84057d047bdc370fda3d6d6cb6f26a90560ca79;hp=03eaf1379bc7392f1e7fb36c4358dcc411b20448;hpb=0d61f205ab4432480dc0e12787774f1d859f2dbf;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 03eaf1379b..08e0d42ab0 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -63,7 +63,6 @@ #include "ardour/utils.h" #include "ardour/session_handle.h" -#include "audio_clock.h" #include "ardour_dialog.h" #include "editing.h" #include "ui_config.h" @@ -83,12 +82,15 @@ class PublicEditor; class RCOptionEditor; class RouteParams_UI; class SessionOptionEditor; +class ShuttleControl; class Splash; class SpeakerDialog; class ThemeManager; +class TimeInfoBox; class MidiTracer; class WindowProxyBase; class GlobalPortMatrixWindow; +class GUIObjectState; namespace Gtkmm2ext { class TearOff; @@ -139,8 +141,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr } int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = ""); - void parse_cmdline_path (const std::string& cmdline_path, std::string& session_name, std::string& session_path, bool& existing_session); - int load_cmdline_session (const std::string& session_name, const std::string& session_path, bool& existing_session); int build_session_from_nsd (const std::string& session_name, const std::string& session_path); bool ask_about_loading_existing_session (const std::string& session_path); @@ -170,6 +170,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::Tooltips& tooltips() { return _tooltips; } + Gtk::HBox& editor_transport_box() { return _editor_transport_box; } + + static PublicEditor* _instance; static sigc::signal Blink; static sigc::signal RapidScreenUpdate; static sigc::signal SuperRapidScreenUpdate; @@ -191,10 +194,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void xrun_handler (framepos_t); void create_xrun_marker (framepos_t); - AudioClock primary_clock; - AudioClock secondary_clock; - AudioClock preroll_clock; - AudioClock postroll_clock; + GUIObjectState* gui_object_state; + + AudioClock* primary_clock; + AudioClock* secondary_clock; + AudioClock* preroll_clock; + AudioClock* postroll_clock; + + TimeInfoBox* time_info_box; void store_clock_modes (); void restore_clock_modes (); @@ -204,16 +211,36 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void add_route (Gtk::Window* float_window); - void session_add_audio_track (int input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup* route_group, uint32_t how_many) { - session_add_audio_route (true, input_channels, output_channels, mode, route_group, how_many); + void session_add_audio_track ( + int input_channels, + int32_t output_channels, + ARDOUR::TrackMode mode, + ARDOUR::RouteGroup* route_group, + uint32_t how_many, + std::string const & name_template + ) { + + session_add_audio_route (true, input_channels, output_channels, mode, route_group, how_many, name_template); } - void session_add_audio_bus (int input_channels, int32_t output_channels, ARDOUR::RouteGroup* route_group, uint32_t how_many) { - session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many); + void session_add_audio_bus ( + int input_channels, + int32_t output_channels, + ARDOUR::RouteGroup* route_group, + uint32_t how_many, + std::string const & name_template + ) { + + session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal, route_group, how_many, name_template); } - void session_add_midi_track (ARDOUR::RouteGroup* route_group, uint32_t how_many) { - session_add_midi_route (true, route_group, how_many); + void session_add_midi_track ( + ARDOUR::RouteGroup* route_group, + uint32_t how_many, + std::string const & name_template + ) { + + session_add_midi_route (true, route_group, how_many, name_template); } /*void session_add_midi_bus () { @@ -281,7 +308,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void startup (); void shutdown (); - int ask_about_saving_session (const std::string & why); + int ask_about_saving_session (const std::vector& actions); /* periodic safety backup, to be precise */ gint autosave_session(); @@ -315,7 +342,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void manage_window (Gtk::Window&); - AudioClock big_clock; + AudioClock* big_clock; ActionWindowProxy* big_clock_window; int original_big_clock_width; int original_big_clock_height; @@ -345,8 +372,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtkmm2ext::TearOff* transport_tearoff; Gtk::Frame transport_frame; Gtk::HBox transport_tearoff_hbox; - Gtk::HBox play_range_hbox; - Gtk::VBox play_range_vbox; + Gtk::HBox _editor_transport_box; Gtk::HBox transport_hbox; Gtk::Fixed transport_base; Gtk::Fixed transport_button_base; @@ -360,7 +386,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::HBox primary_clock_hbox; Gtk::HBox secondary_clock_hbox; - struct TransportControllable : public PBD::Controllable { enum ToggleType { Roll = 0, @@ -370,8 +395,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr GotoEnd, AutoLoop, PlaySelection, - ShuttleControl - }; TransportControllable (std::string name, ARDOUR_UI&, ToggleType); @@ -392,7 +415,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr boost::shared_ptr play_selection_controllable; boost::shared_ptr rec_controllable; boost::shared_ptr shuttle_controllable; - BindingProxy shuttle_controller_binding_proxy; + boost::shared_ptr join_play_range_controllable; void set_transport_controllable_state (const XMLNode&); XMLNode& get_transport_controllable_state (); @@ -404,43 +427,14 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr BindableButton auto_loop_button; BindableButton play_selection_button; BindableButton rec_button; - Gtk::ToggleButton join_play_range_button; + BindableToggleButton join_play_range_button; void toggle_external_sync (); void toggle_time_master (); void toggle_video_sync (); - Gtk::DrawingArea shuttle_box; - Gtk::EventBox speed_display_box; - Gtk::Label speed_display_label; - Gtk::Button shuttle_units_button; - Gtk::ComboBoxText shuttle_style_button; - Gtk::Menu* shuttle_unit_menu; - Gtk::Menu* shuttle_style_menu; - 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_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); - void use_shuttle_fract (bool force); - - bool shuttle_grabbed; - double shuttle_fract; - - Gtkmm2ext::StatefulToggleButton punch_in_button; - Gtkmm2ext::StatefulToggleButton punch_out_button; + ShuttleControl* shuttle_box; + Gtkmm2ext::StatefulToggleButton auto_return_button; Gtkmm2ext::StatefulToggleButton auto_play_button; Gtkmm2ext::StatefulToggleButton auto_input_button; @@ -529,6 +523,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::EventBox sample_rate_box; void update_sample_rate (ARDOUR::framecnt_t); + Gtk::Label format_label; + Gtk::EventBox format_box; + void update_format (); + gint every_second (); gint every_point_one_seconds (); gint every_point_zero_one_seconds (); @@ -549,8 +547,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void edit_metadata (); void import_metadata (); - void session_add_audio_route (bool disk, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, ARDOUR::RouteGroup *, uint32_t how_many); - void session_add_midi_route (bool disk, ARDOUR::RouteGroup *, uint32_t how_many); + void session_add_audio_route (bool, int32_t, int32_t, ARDOUR::TrackMode, ARDOUR::RouteGroup *, uint32_t, std::string const &); + void session_add_midi_route (bool, ARDOUR::RouteGroup *, uint32_t, std::string const &); void set_transport_sensitivity (bool); @@ -580,6 +578,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr guint32 last_key_press_time; void snapshot_session (bool switch_to_it); + void rename_session (); Mixer_UI *mixer; int create_mixer (); @@ -620,7 +619,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr /* Keyboard Handling */ ArdourKeyboard* keyboard; - + /* Keymap handling */ void install_actions (); @@ -682,6 +681,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void toggle_use_osc (); void parameter_changed (std::string); + void session_parameter_changed (std::string); bool first_idle (); @@ -701,19 +701,20 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void loading_message (const std::string& msg); void end_loading_messages (); - void platform_specific (); - void platform_setup (); - void fontconfig_dialog (); void toggle_translations (); PBD::ScopedConnectionList forever_connections; void step_edit_status_change (bool); + void platform_specific (); + void platform_setup (); + /* these are used only in response to a platform-specific "ShouldQuit" signal */ bool idle_finish (); void queue_finish (); + void fontconfig_dialog (); std::list _window_proxies;