X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=37e1a23c21352642b1bbaf6ad2b2717e496093c6;hb=015fc7b39fab97cee1875231694adce43155ceb5;hp=25f3068a813d39c04d0b38157e98f79dee0e6c7c;hpb=81b9700c145abfb6f2e32d5a9bd13895e42b04e2;p=ardour.git diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 25f3068a81..37e1a23c21 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -23,18 +23,19 @@ This is to cut down on the compile times. It also helps with my sanity. */ -#include +#include "ardour/session.h" #include "actions.h" #include "ardour_ui.h" -#include "connection_editor.h" #include "location_ui.h" #include "mixer_ui.h" -#include "option_editor.h" +#include "rc_option_editor.h" #include "public_editor.h" #include "route_params_ui.h" #include "sfdb_ui.h" -#include "color_manager.h" +#include "theme_manager.h" +#include "bundle_manager.h" +#include "keyeditor.h" #include "i18n.h" @@ -49,7 +50,8 @@ ARDOUR_UI::connect_to_session (Session *s) { session = s; - session->HaltOnXrun.connect (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message)); + session->Xrun.connect (mem_fun(*this, &ARDOUR_UI::xrun_handler)); + session->RecordStateChanged.connect (mem_fun (*this, &ARDOUR_UI::record_state_changed)); /* sensitize menu bar options that are now valid */ @@ -61,9 +63,22 @@ ARDOUR_UI::connect_to_session (Session *s) ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false); } + if (!session->control_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")); + if (act) { + act->set_sensitive (true); + } + /* there are never any selections on startup */ - ActionManager::set_sensitive (ActionManager::region_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::time_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::track_selection_sensitive_actions, false); ActionManager::set_sensitive (ActionManager::line_selection_sensitive_actions, false); @@ -76,14 +91,6 @@ ARDOUR_UI::connect_to_session (Session *s) rec_button.set_sensitive (true); shuttle_box.set_sensitive (true); - if (session->n_diskstreams() == 0) { - session->DiskstreamAdded.connect (mem_fun(*this, &ARDOUR_UI::diskstream_added)); - } - - if (connection_editor) { - connection_editor->set_session (s); - } - if (location_ui) { location_ui->set_session(s); } @@ -92,14 +99,6 @@ ARDOUR_UI::connect_to_session (Session *s) route_params->set_session (s); } - if (option_editor) { - option_editor->set_session (s); - } - - if (sfdb) { - sfdb->set_session (s); - } - setup_session_options (); Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink)); @@ -119,6 +118,10 @@ ARDOUR_UI::connect_to_session (Session *s) solo_alert_button.set_active (session->soloing()); + /* update autochange callback on dirty state changing */ + + session->DirtyChanged.connect (mem_fun(*this, &ARDOUR_UI::update_autosave)); + /* can't be auditioning here */ primary_clock.set_session (s); @@ -132,13 +135,18 @@ ARDOUR_UI::connect_to_session (Session *s) connect_dependents_to_session (s); + /* listen to clock mode changes. don't do this earlier because otherwise as the clocks + restore their modes or are explicitly set, we will cause the "new" mode to be saved + back to the session XML ("Extra") state. + */ + + AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes)); + + Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle)); + start_clocking (); start_blinking (); - if (editor) { - editor->present(); - } - transport_stopped (); second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000); @@ -147,11 +155,12 @@ ARDOUR_UI::connect_to_session (Session *s) } int -ARDOUR_UI::unload_session () +ARDOUR_UI::unload_session (bool hide_stuff) { if (session && session->dirty()) { switch (ask_about_saving_session (_("close"))) { case -1: + // cancel return 1; case 1: @@ -159,9 +168,16 @@ ARDOUR_UI::unload_session () break; } } - editor->hide (); + + if (hide_stuff) { + editor->hide (); + mixer->hide (); + theme_manager->hide (); + } + second_connection.disconnect (); point_one_second_connection.disconnect (); + point_oh_five_second_connection.disconnect (); point_zero_one_second_connection.disconnect(); ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false); @@ -182,14 +198,6 @@ ARDOUR_UI::unload_session () preroll_clock.set_session (0); postroll_clock.set_session (0); - if (option_editor) { - option_editor->set_session (0); - } - - if (mixer) { - mixer->hide_all (); - } - delete session; session = 0; @@ -198,45 +206,6 @@ ARDOUR_UI::unload_session () return 0; } -int -ARDOUR_UI::create_connection_editor () -{ -#if 0 - if (connection_editor == 0) { - connection_editor = new ConnectionEditor (); - connection_editor->signal_unmap().connect (sigc::bind (ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleConnections"))); - } - - if (session) { - connection_editor->set_session (session); - } -#endif - - return 0; -} - -void -ARDOUR_UI::toggle_connection_editor () -{ - if (create_connection_editor()) { - return; - } - -#if 0 - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleConnections")); - if (act) { - RefPtr tact = RefPtr::cast_dynamic(act); - - if (tact->get_active()) { - connection_editor->show_all (); - connection_editor->present (); - } else { - connection_editor->hide (); - } - } -#endif -} - void ARDOUR_UI::toggle_big_clock_window () { @@ -254,12 +223,12 @@ ARDOUR_UI::toggle_big_clock_window () } void -ARDOUR_UI::toggle_options_window () +ARDOUR_UI::toggle_rc_options_window () { - if (option_editor == 0) { - option_editor = new OptionEditor (*this, *editor, *mixer); - option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleOptionsEditor"))); - option_editor->set_session (session); + if (rc_option_editor == 0) { + rc_option_editor = new RCOptionEditor; + rc_option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleOptionsEditor"))); + rc_option_editor->set_session (session); } RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleOptionsEditor")); @@ -267,10 +236,10 @@ ARDOUR_UI::toggle_options_window () RefPtr tact = RefPtr::cast_dynamic(act); if (tact->get_active()) { - option_editor->show_all (); - option_editor->present (); + rc_option_editor->show_all (); + rc_option_editor->present (); } else { - option_editor->hide (); + rc_option_editor->hide (); } } } @@ -307,79 +276,97 @@ ARDOUR_UI::toggle_location_window () } void -ARDOUR_UI::toggle_color_manager () +ARDOUR_UI::toggle_key_editor () { - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleColorManager")); + if (key_editor == 0) { + key_editor = new KeyEditor; + key_editor->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleKeyEditor"))); + } + + RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleKeyEditor")); if (act) { RefPtr tact = RefPtr::cast_dynamic(act); if (tact->get_active()) { - color_manager->show_all (); - color_manager->present (); + key_editor->show_all (); + key_editor->present (); } else { - color_manager->hide (); + key_editor->hide (); } } } -int -ARDOUR_UI::create_route_params () +void +ARDOUR_UI::toggle_theme_manager () { - if (route_params == 0) { - route_params = new RouteParams_UI (*engine); - route_params->set_session (session); - route_params->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleInspector"))); + RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleThemeManager")); + if (act) { + RefPtr tact = RefPtr::cast_dynamic(act); + + if (tact->get_active()) { + theme_manager->show_all (); + theme_manager->present (); + } else { + theme_manager->hide (); + } } - return 0; } void -ARDOUR_UI::toggle_route_params_window () +ARDOUR_UI::create_bundle_manager () { - if (create_route_params ()) { - return; + if (bundle_manager == 0) { + bundle_manager = new BundleManager (*session); + bundle_manager->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("/Common/ToggleBundleManager"))); } +} - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleInspector")); +void +ARDOUR_UI::toggle_bundle_manager () +{ + create_bundle_manager (); + + RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleBundleManager")); if (act) { - RefPtr tact = RefPtr::cast_dynamic(act); + RefPtr tact = RefPtr::cast_dynamic (act); if (tact->get_active()) { - route_params->show_all (); - route_params->present (); + bundle_manager->show_all (); + bundle_manager->present (); } else { - route_params->hide (); + bundle_manager->hide (); } } } int -ARDOUR_UI::create_sound_file_browser () +ARDOUR_UI::create_route_params () { - if (sfdb == 0) { - sfdb = new SoundFileBrowser (_("Sound File Browser"), session); - sfdb->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleSoundFileBrowser"))); + if (route_params == 0) { + route_params = new RouteParams_UI (); + route_params->set_session (session); + route_params->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleInspector"))); } return 0; } - + void -ARDOUR_UI::toggle_sound_file_browser () +ARDOUR_UI::toggle_route_params_window () { - if (create_sound_file_browser()) { + if (create_route_params ()) { return; } - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleSoundFileBrowser")); + RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleInspector")); if (act) { RefPtr tact = RefPtr::cast_dynamic(act); if (tact->get_active()) { - sfdb->show_all(); - sfdb->present(); + route_params->show_all (); + route_params->present (); } else { - sfdb->hide (); - } + route_params->hide (); + } } } @@ -394,3 +381,24 @@ ARDOUR_UI::handle_locations_change (Location* ignored) } } } + +bool +ARDOUR_UI::main_window_state_event_handler (GdkEventWindowState* ev, bool window_was_editor) +{ + if (window_was_editor) { + + if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) && + (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) { + float_big_clock (editor); + } + + } else { + + if ((ev->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) && + (ev->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)) { + float_big_clock (mixer); + } + } + + return false; +}