X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=f29f06ce94c9f872f833269c52c66da7c54c87c7;hb=07ff18db2a0c8454f9d2535cad4efbf940d16aa9;hp=d38dabc0858d528439080b7520f8933c1adc6472;hpb=7590b859fd0f836c624394c674aac09f812b3cfb;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index d38dabc085..f29f06ce94 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -63,11 +63,13 @@ #include "ardour/utils.h" #include "ardour/session_handle.h" -#include "audio_clock.h" #include "ardour_dialog.h" +#include "ardour_button.h" #include "editing.h" #include "ui_config.h" #include "window_proxy.h" +#include "enums.h" +#include "visibility_group.h" class About; class AddRouteDialog; @@ -83,12 +85,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; @@ -101,6 +106,7 @@ namespace ARDOUR { class Route; class RouteGroup; class Location; + class ProcessThread; } class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr @@ -139,8 +145,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 +174,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 +198,12 @@ 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; + + TimeInfoBox* time_info_box; void store_clock_modes (); void restore_clock_modes (); @@ -212,7 +221,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr 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); } @@ -223,7 +232,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr 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); } @@ -232,7 +241,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr uint32_t how_many, std::string const & name_template ) { - + session_add_midi_route (true, route_group, how_many, name_template); } @@ -257,6 +266,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void add_window_proxy (WindowProxyBase *); void remove_window_proxy (WindowProxyBase *); + void get_process_buffers (); + void drop_process_buffers (); + protected: friend class PublicEditor; @@ -288,9 +300,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void toggle_mixer_window (); void toggle_mixer_on_top (); - Gtk::ToggleButton preroll_button; - Gtk::ToggleButton postroll_button; - int setup_windows (); void setup_transport (); void setup_clock (); @@ -301,7 +310,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(); @@ -335,7 +344,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; @@ -365,8 +374,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; @@ -380,7 +388,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, @@ -390,16 +397,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr GotoEnd, AutoLoop, PlaySelection, - ShuttleControl - }; TransportControllable (std::string name, ARDOUR_UI&, ToggleType); void set_value (double); double get_value (void) const; - void set_id (const std::string&); - ARDOUR_UI& ui; ToggleType type; }; @@ -412,55 +415,26 @@ 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 (); - BindableButton roll_button; - BindableButton stop_button; - BindableButton goto_start_button; - BindableButton goto_end_button; - BindableButton auto_loop_button; - BindableButton play_selection_button; - BindableButton rec_button; - Gtk::ToggleButton join_play_range_button; + ArdourButton roll_button; + ArdourButton stop_button; + ArdourButton goto_start_button; + ArdourButton goto_end_button; + ArdourButton auto_loop_button; + ArdourButton play_selection_button; + ArdourButton rec_button; + ArdourButton 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; @@ -549,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 (); @@ -600,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 (); @@ -640,7 +619,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr /* Keyboard Handling */ ArdourKeyboard* keyboard; - + /* Keymap handling */ void install_actions (); @@ -702,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 (); @@ -721,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; @@ -741,6 +722,13 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr int ambiguous_file (std::string file, std::string path, std::vector hits); bool click_button_clicked (GdkEventButton *); + + VisibilityGroup _status_bar_visibility; + + /** A ProcessThread so that we have some thread-local buffers for use by + * PluginEqGui::impulse_analysis (). + */ + ARDOUR::ProcessThread* _process_thread; }; #endif /* __ardour_gui_h__ */