X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=287c9128b47e3467585839eaffc45eae67ba8f2d;hb=95a61717faa4b427be0e7821ee91f7df81065815;hp=4be65dc9f0ce8f09c010fee97bfca52d40161840;hpb=eb1e423b7521d4c277c11a884113f40e7406ade8;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 4be65dc9f0..287c9128b4 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -45,6 +45,7 @@ #include "add_video_dialog.h" #include "ardour_ui.h" #include "big_clock_window.h" +#include "big_transport_window.h" #include "bundle_manager.h" #include "global_port_matrix.h" #include "gui_object.h" @@ -60,6 +61,7 @@ #include "midi_tracer.h" #include "mini_timeline.h" #include "mixer_ui.h" +#include "plugin_dspload_window.h" #include "public_editor.h" #include "processor_box.h" #include "rc_option_editor.h" @@ -71,6 +73,7 @@ #include "sfdb_ui.h" #include "time_info_box.h" #include "timers.h" +#include "transport_masters_dialog.h" #include "pbd/i18n.h" @@ -86,6 +89,12 @@ ARDOUR_UI::set_session (Session *s) { SessionHandlePtr::set_session (s); + transport_ctrl.set_session (s); + + if (big_transport_window) { + big_transport_window->set_session (s); + } + if (!_session) { WM::Manager::instance().set_session (s); /* Session option editor cannot exist across change-of-session */ @@ -120,6 +129,9 @@ ARDOUR_UI::set_session (Session *s) big_clock->set_session (s); video_timeline->set_session (s); lua_script_window->set_session (s); + plugin_dsp_load_window->set_session (s); + transport_masters_window->set_session (s); + rc_option_editor->set_session (s); /* sensitize menu bar options that are now valid */ @@ -132,13 +144,6 @@ ARDOUR_UI::set_session (Session *s) ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false); } - if (!_session->monitor_out()) { - Glib::RefPtr act = ActionManager::get_action (X_("options"), X_("SoloViaBus")); - if (act) { - act->set_sensitive (false); - } - } - /* allow wastebasket flush again */ Glib::RefPtr act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket")); @@ -150,12 +155,14 @@ ARDOUR_UI::set_session (Session *s) ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::route_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::bus_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::vca_selection_sensitive_actions, false); + ActionManager::set_sensitive (ActionManager::stripable_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::point_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false); - rec_button.set_sensitive (true); - solo_alert_button.set_active (_session->soloing()); setup_session_options (); @@ -165,7 +172,6 @@ ARDOUR_UI::set_session (Session *s) _session->SaveSessionRequested.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::save_session_at_its_request, this, _1), gui_context()); _session->StateSaved.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_title, this), gui_context()); _session->RecordStateChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::record_state_changed, this), gui_context()); - _session->StepEditStatusChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::step_edit_status_change, this, _1), gui_context()); _session->TransportStateChange.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::map_transport_state, this), gui_context()); _session->DirtyChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dirty_changed, this), gui_context()); @@ -175,7 +181,6 @@ ARDOUR_UI::set_session (Session *s) _session->locations()->added.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context()); _session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context()); _session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ()); - _session->auto_loop_location_changed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::set_loop_sensitivity, this), gui_context ()); /* Clocks are on by default after we are connected to a session, so show that here. */ @@ -202,21 +207,19 @@ ARDOUR_UI::set_session (Session *s) update_format (); - if (meter_box.get_parent()) { - transport_hbox.remove (meter_box); - transport_hbox.remove (editor_meter_peak_display); + if (editor_meter_table.get_parent()) { + transport_hbox.remove (editor_meter_table); } if (editor_meter) { - meter_box.remove(*editor_meter); + editor_meter_table.remove(*editor_meter); delete editor_meter; editor_meter = 0; editor_meter_peak_display.hide(); } - if (meter_box.get_parent()) { - transport_hbox.remove (meter_box); - transport_hbox.remove (editor_meter_peak_display); + if (editor_meter_table.get_parent()) { + transport_hbox.remove (editor_meter_table); } if (_session && @@ -230,9 +233,14 @@ ARDOUR_UI::set_session (Session *s) editor_meter->set_meter_type (_session->master_out()->meter_type()); editor_meter->setup_meters (30, 10, 6); editor_meter->show(); - meter_box.pack_start(*editor_meter); - editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1)); + + editor_meter_table.set_spacings(3); + editor_meter_table.attach(*editor_meter, 0,1, 0,1, FILL, FILL); + editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL); + + editor_meter->show(); + editor_meter_peak_display.show(); } ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display)); @@ -241,7 +249,7 @@ ARDOUR_UI::set_session (Session *s) editor_meter_peak_display.set_name ("meterbridge peakindicator"); editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS); - editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * UIConfiguration::instance().get_ui_scale())), -1); + editor_meter_peak_display.set_size_request (-1, std::max(6.f, rintf(5.f * UIConfiguration::instance().get_ui_scale())) ); editor_meter_peak_display.set_corner_radius (3.0); editor_meter_max_peak = -INFINITY; @@ -302,7 +310,7 @@ ARDOUR_UI::unload_session (bool hide_stuff) fps_connection.disconnect(); if (editor_meter) { - meter_box.remove(*editor_meter); + editor_meter_table.remove(*editor_meter); delete editor_meter; editor_meter = 0; editor_meter_peak_display.hide(); @@ -310,8 +318,6 @@ ARDOUR_UI::unload_session (bool hide_stuff) ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false); - rec_button.set_sensitive (false); - WM::Manager::instance().set_session ((ARDOUR::Session*) 0); if (ARDOUR_UI::instance()->video_timeline) { @@ -324,12 +330,10 @@ ARDOUR_UI::unload_session (bool hide_stuff) blink_connection.disconnect (); - delete _session; + ARDOUR::Session* session_to_delete = _session; _session = 0; + delete session_to_delete; - session_loaded = false; - - update_buffer_load (); update_title (); return 0; @@ -706,14 +710,14 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t) } for (std::vector::iterator s = insensitive_action_names.begin(); s != insensitive_action_names.end(); ++s) { - action = ActionManager::get_action (X_("Common"), (*s).c_str()); + action = ActionManager::get_action (X_("Common"), (*s).c_str(), false); if (action) { action->set_sensitive (false); } } for (std::vector::iterator s = sensitive_action_names.begin(); s != sensitive_action_names.end(); ++s) { - action = ActionManager::get_action (X_("Common"), (*s).c_str()); + action = ActionManager::get_action (X_("Common"), (*s).c_str(), false); if (action) { action->set_sensitive (true); } @@ -868,6 +872,14 @@ ARDOUR_UI::create_big_clock_window () return new BigClockWindow (*big_clock); } +BigTransportWindow* +ARDOUR_UI::create_big_transport_window () +{ + BigTransportWindow* btw = new BigTransportWindow (); + btw->set_session (_session); + return btw; +} + void ARDOUR_UI::handle_locations_change (Location *) { @@ -890,6 +902,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj if (big_clock_window) { big_clock_window->set_transient_for (*editor->own_window()); } + if (big_transport_window) { + big_transport_window->set_transient_for (*editor->own_window()); + } } } else if (object == mixer) { @@ -899,6 +914,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj if (big_clock_window) { big_clock_window->set_transient_for (*mixer->own_window()); } + if (big_transport_window) { + big_transport_window->set_transient_for (*mixer->own_window()); + } } } @@ -934,25 +952,3 @@ ARDOUR_UI::toggle_mixer_space() } } } - -void -ARDOUR_UI::toggle_mixer_list() -{ - Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMixerList"); - - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - mixer->show_mixer_list (tact->get_active()); - } -} - -void -ARDOUR_UI::toggle_monitor_section_visibility () -{ - Glib::RefPtr act = ActionManager::get_action ("Common", "ToggleMonitorSection"); - - if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic(act); - mixer->show_monitor_section (tact->get_active()); - } -}