X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=b84015623d3490a82be3edb0664811a38ad3311c;hb=0cdb918d4dd409075c0e2fdc50633e7b6adb22f2;hp=f0637ad535a77a0e27f04e6e54472218c358898e;hpb=cd87dceb0fda44d7c8fcc2b7844f65def25edb23;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f0637ad535..b84015623d 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,6 +75,7 @@ class About; class AddRouteDialog; class NewSessionDialog; class LocationUI; +class ColorManager; namespace Gtkmm2ext { class TearOff; @@ -86,6 +86,7 @@ namespace ARDOUR { class Route; class Port; class IO; + class ControlProtocolInfo; }; namespace ALSA { @@ -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,12 +147,12 @@ 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 (); - - gint32 select_diskstream (GdkEventButton *ev); + void toggle_editing_space(); Gtk::Tooltips& tooltips() { return _tooltips; } @@ -164,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); @@ -188,20 +189,32 @@ class ARDOUR_UI : public Gtkmm2ext::UI void add_route (); - void session_add_audio_track (int input_channels, int32_t output_channels) { - session_add_audio_route (true, input_channels, output_channels); + 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_bus (int input_channels, int32_t output_channels) { - session_add_audio_route (false, input_channels, output_channels); + session_add_audio_route (false, input_channels, output_channels, ARDOUR::Normal); + } + + void session_add_midi_track () { + session_add_midi_route (true); } - void session_add_midi_track (); + void session_add_midi_bus () { + session_add_midi_route (false); + } void set_engine (ARDOUR::AudioEngine&); gint exit_on_main_window_close (GdkEventAny *); + 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; @@ -299,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 *); @@ -382,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); @@ -410,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); @@ -459,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 a, std::pair b) const { @@ -473,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; @@ -487,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 (); @@ -507,13 +526,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI sigc::connection point_one_second_connection; sigc::connection point_zero_one_second_connection; - void diskstream_added (ARDOUR::DiskStream*); + 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; void open_session (); @@ -522,18 +540,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); + void session_add_midi_route (bool disk); - void session_add_audio_route (bool disk, int32_t input_channels, int32_t output_channels); - - 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 (); @@ -558,7 +572,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; @@ -581,6 +596,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 */ @@ -602,17 +620,15 @@ class ARDOUR_UI : public Gtkmm2ext::UI /* Keymap handling */ - void install_keybindings (); Glib::RefPtr 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; @@ -631,9 +647,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*); + void delete_sources_in_the_right_thread (list*); void editor_display_control_changed (Editing::DisplayControl c); @@ -696,6 +710,8 @@ 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*); };