X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.cc;h=e51edbb6318c5ce336477216a6448d773aabc67b;hb=f6f3769ae11e3a9e888abdf8c3ed92f08d3c9a5b;hp=29febd0cdf113aa611a17fe68e90ab3793aa029c;hpb=e64eae1ecafe0b19a1d368c05678dc2b9b00d434;p=ardour.git diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 29febd0cdf..e51edbb631 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -36,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -70,6 +71,9 @@ #include #include #include +#include + +typedef uint64_t microseconds_t; #include "actions.h" #include "ardour_ui.h" @@ -82,10 +86,14 @@ #include "add_route_dialog.h" #include "new_session_dialog.h" #include "about.h" +#include "splash.h" #include "utils.h" #include "gui_thread.h" #include "theme_manager.h" #include "bundle_manager.h" +#include "session_metadata_dialog.h" +#include "gain_meter.h" +#include "route_time_axis.h" #include "i18n.h" @@ -112,10 +120,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true), postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true), - /* adjuster table */ - - adjuster_table (3, 3), - /* preroll stuff */ preroll_button (_("pre\nroll")), @@ -123,18 +127,18 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) /* big clock */ - big_clock (X_("bigclock"), false, "BigClockNonRecording", false, false, true), + big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true), /* transport */ - roll_controllable ("transport roll", *this, TransportControllable::Roll), - stop_controllable ("transport stop", *this, TransportControllable::Stop), - goto_start_controllable ("transport goto start", *this, TransportControllable::GotoStart), - goto_end_controllable ("transport goto end", *this, TransportControllable::GotoEnd), - auto_loop_controllable ("transport auto loop", *this, TransportControllable::AutoLoop), - play_selection_controllable ("transport play selection", *this, TransportControllable::PlaySelection), - rec_controllable ("transport rec-enable", *this, TransportControllable::RecordEnable), - shuttle_controllable ("shuttle", *this, TransportControllable::ShuttleControl), + roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)), + stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop)), + goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart)), + goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd)), + auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop)), + play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)), + rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)), + shuttle_controllable (new TransportControllable ("shuttle", *this, TransportControllable::ShuttleControl)), shuttle_controller_binding_proxy (shuttle_controllable), roll_button (roll_controllable), @@ -169,7 +173,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) #ifdef TOP_MENUBAR _auto_display_errors = false; #endif + about = 0; + splash = 0; + + if (ARDOUR_COMMAND_LINE::session_name.length()) { + /* only show this if we're not going to post the new session dialog */ + show_splash (); + } if (theArdourUI == 0) { theArdourUI = this; @@ -182,6 +193,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) mixer = 0; session = 0; editor = 0; + engine = 0; _session_is_new = false; big_clock_window = 0; session_selector_window = 0; @@ -189,7 +201,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) connection_editor = 0; _will_create_new_session_automatically = false; new_session_dialog = 0; - loading_dialog = 0; add_route_dialog = 0; route_params = 0; option_editor = 0; @@ -199,24 +210,18 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) have_disk_speed_dialog_displayed = false; session_loaded = false; last_speed_displayed = -1.0f; - ab_direction = true; - - sys::path key_bindings_file; - - find_file_in_search_path (ardour_search_path() + system_config_search_path(), - "ardour.bindings", key_bindings_file); + ignore_dual_punch = false; + _mixer_on_top = false; - keybindings_path = key_bindings_file.to_string(); + roll_button.unset_flags (Gtk::CAN_FOCUS); + stop_button.unset_flags (Gtk::CAN_FOCUS); + goto_start_button.unset_flags (Gtk::CAN_FOCUS); + goto_end_button.unset_flags (Gtk::CAN_FOCUS); + auto_loop_button.unset_flags (Gtk::CAN_FOCUS); + play_selection_button.unset_flags (Gtk::CAN_FOCUS); + rec_button.unset_flags (Gtk::CAN_FOCUS); - /* store all bindings changes in per-user file, no matter where they were loaded from */ - user_keybindings_path = user_config_directory().to_string (); - user_keybindings_path += '/'; - user_keybindings_path += "ardour.bindings"; - - can_save_keybindings = false; - - last_configure_time.tv_sec = 0; - last_configure_time.tv_usec = 0; + last_configure_time= 0; shuttle_grabbed = false; shuttle_fract = 0.0; @@ -225,38 +230,55 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[]) shuttle_style_menu = 0; shuttle_unit_menu = 0; - gettimeofday (&last_peak_grab, 0); - gettimeofday (&last_shuttle_request, 0); - + // We do not have jack linked in yet so; + + last_shuttle_request = last_peak_grab = 0; // get_microseconds(); + ARDOUR::Diskstream::DiskOverrun.connect (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler)); ARDOUR::Diskstream::DiskUnderrun.connect (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler)); + /* handle dialog requests */ + + ARDOUR::Session::Dialog.connect (mem_fun(*this, &ARDOUR_UI::session_dialog)); + /* handle pending state with a dialog */ ARDOUR::Session::AskAboutPendingState.connect (mem_fun(*this, &ARDOUR_UI::pending_state_dialog)); + /* handle sr mismatch with a dialog */ + + ARDOUR::Session::AskAboutSampleRateMismatch.connect (mem_fun(*this, &ARDOUR_UI::sr_mismatch_dialog)); + /* lets get this party started */ try { - ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization); + if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) { + throw failed_constructor (); + } + setup_gtk_ardour_enums (); Config->set_current_owner (ConfigVariableBase::Interface); setup_profile (); + GainMeter::setup_slider_pix (); + RouteTimeAxisView::setup_slider_pix (); + } catch (failed_constructor& err) { error << _("could not initialize Ardour.") << endmsg; // pass it on up - throw err; + throw; } /* we like keyboards */ keyboard = new Keyboard; + reset_dpi(); + starting.connect (mem_fun(*this, &ARDOUR_UI::startup)); stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown)); - platform_specific (); + platform_setup (); } int @@ -268,6 +290,8 @@ ARDOUR_UI::create_engine () return 0; } + loading_message (_("Starting audio engine")); + try { engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name); @@ -289,8 +313,6 @@ ARDOUR_UI::create_engine () void ARDOUR_UI::post_engine () { - extern int setup_midi (); - /* Things to be done once we create the AudioEngine */ @@ -338,8 +360,13 @@ ARDOUR_UI::post_engine () /* set default clock modes */ - primary_clock.set_mode (AudioClock::SMPTE); - secondary_clock.set_mode (AudioClock::BBT); + if (Profile->get_sae()) { + primary_clock.set_mode (AudioClock::BBT); + secondary_clock.set_mode (AudioClock::MinSec); + } else { + primary_clock.set_mode (AudioClock::SMPTE); + secondary_clock.set_mode (AudioClock::BBT); + } /* start the time-of-day-clock */ @@ -369,46 +396,34 @@ ARDOUR_UI::~ARDOUR_UI () { save_ardour_state (); - if (keyboard) { - delete keyboard; - } - - if (editor) { - delete editor; - } - - if (mixer) { - delete mixer; - } - - if (add_route_dialog) { - delete add_route_dialog; - } - + delete keyboard; + delete editor; + delete mixer; + delete add_route_dialog; + delete new_session_dialog; +} - if (new_session_dialog) { - delete new_session_dialog; +void +ARDOUR_UI::pop_back_splash () +{ + if (Splash::instance()) { + // Splash::instance()->pop_back(); + Splash::instance()->hide (); } } gint ARDOUR_UI::configure_timeout () { - struct timeval now; - struct timeval diff; - - if (last_configure_time.tv_sec == 0 && last_configure_time.tv_usec == 0) { + if (last_configure_time == 0) { /* no configure events yet */ return TRUE; } - gettimeofday (&now, 0); - timersub (&now, &last_configure_time, &diff); - /* force a gap of 0.5 seconds since the last configure event */ - if (diff.tv_sec == 0 && diff.tv_usec < 500000) { + if (get_microseconds() - last_configure_time < 500000) { return TRUE; } else { have_configure_timeout = false; @@ -421,7 +436,7 @@ gboolean ARDOUR_UI::configure_handler (GdkEventConfigure* conf) { if (have_configure_timeout) { - gettimeofday (&last_configure_time, 0); + last_configure_time = get_microseconds(); } else { Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::configure_timeout), 100); have_configure_timeout = true; @@ -436,28 +451,28 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node) const XMLProperty* prop; if ((prop = node.property ("roll")) != 0) { - roll_controllable.set_id (prop->value()); + roll_controllable->set_id (prop->value()); } if ((prop = node.property ("stop")) != 0) { - stop_controllable.set_id (prop->value()); + stop_controllable->set_id (prop->value()); } - if ((prop = node.property ("goto_start")) != 0) { - goto_start_controllable.set_id (prop->value()); + if ((prop = node.property ("goto-start")) != 0) { + goto_start_controllable->set_id (prop->value()); } - if ((prop = node.property ("goto_end")) != 0) { - goto_end_controllable.set_id (prop->value()); + if ((prop = node.property ("goto-end")) != 0) { + goto_end_controllable->set_id (prop->value()); } - if ((prop = node.property ("auto_loop")) != 0) { - auto_loop_controllable.set_id (prop->value()); + if ((prop = node.property ("auto-loop")) != 0) { + auto_loop_controllable->set_id (prop->value()); } - if ((prop = node.property ("play_selection")) != 0) { - play_selection_controllable.set_id (prop->value()); + if ((prop = node.property ("play-selection")) != 0) { + play_selection_controllable->set_id (prop->value()); } if ((prop = node.property ("rec")) != 0) { - rec_controllable.set_id (prop->value()); + rec_controllable->set_id (prop->value()); } if ((prop = node.property ("shuttle")) != 0) { - shuttle_controllable.set_id (prop->value()); + shuttle_controllable->set_id (prop->value()); } } @@ -467,21 +482,21 @@ ARDOUR_UI::get_transport_controllable_state () XMLNode* node = new XMLNode(X_("TransportControllables")); char buf[64]; - roll_controllable.id().print (buf, sizeof (buf)); + roll_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("roll"), buf); - stop_controllable.id().print (buf, sizeof (buf)); + stop_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("stop"), buf); - goto_start_controllable.id().print (buf, sizeof (buf)); + goto_start_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("goto_start"), buf); - goto_end_controllable.id().print (buf, sizeof (buf)); + goto_end_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("goto_end"), buf); - auto_loop_controllable.id().print (buf, sizeof (buf)); + auto_loop_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("auto_loop"), buf); - play_selection_controllable.id().print (buf, sizeof (buf)); + play_selection_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("play_selection"), buf); - rec_controllable.id().print (buf, sizeof (buf)); + rec_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("rec"), buf); - shuttle_controllable.id().print (buf, sizeof (buf)); + shuttle_controllable->id().print (buf, sizeof (buf)); node->add_property (X_("shuttle"), buf); return *node; @@ -501,7 +516,11 @@ ARDOUR_UI::save_ardour_state () XMLNode* node = new XMLNode (keyboard->get_state()); Config->add_extra_xml (*node); Config->add_extra_xml (get_transport_controllable_state()); + if (new_session_dialog && new_session_dialog->engine_control.was_used()) { + Config->add_extra_xml (new_session_dialog->engine_control.get_state()); + } Config->save_state(); + ui_config->save_state (); XMLNode enode(static_cast(editor)->get_state()); XMLNode mnode(mixer->get_state()); @@ -514,19 +533,28 @@ ARDOUR_UI::save_ardour_state () Config->add_instant_xml (mnode); } - save_keybindings (); + Keyboard::save_keybindings (); } gint ARDOUR_UI::autosave_session () { - if (!Config->get_periodic_safety_backups()) + if (g_main_depth() > 1) { + /* inside a recursive main loop, + give up because we may not be able to + take a lock. + */ return 1; + } - if (session) { - session->maybe_write_autosave(); + if (!Config->get_periodic_safety_backups()) { + return 1; } + if (session) { + session->maybe_write_autosave(); + } + return 1; } @@ -596,10 +624,7 @@ Please consider the possibilities, and perhaps (re)start JACK.")); win.show_all (); win.set_position (Gtk::WIN_POS_CENTER); - - if (!ARDOUR_COMMAND_LINE::no_splash) { - hide_splash (); - } + pop_back_splash (); /* we just don't care about the result, but we want to block */ @@ -610,91 +635,21 @@ void ARDOUR_UI::startup () { string name, path; - bool isnew; - - new_session_dialog = new NewSessionDialog(); - /* If no session name is given: we're not loading a session yet, nor creating a new one */ - - if (ARDOUR_COMMAND_LINE::session_name.length()) { - - /* Load session or start the new session dialog */ - - if (find_session (ARDOUR_COMMAND_LINE::session_name, path, name, isnew)) { - error << string_compose(_("could not load command line session \"%1\""), - ARDOUR_COMMAND_LINE::session_name) << endmsg; - return; - } - - if (!ARDOUR_COMMAND_LINE::new_session) { - - /* Supposed to be loading an existing session, but the session doesn't exist */ - - if (isnew) { - error << string_compose (_("\n\nNo session named \"%1\" exists.\n" - "To create it from the command line, start ardour as \"ardour --new %1"), path) - << endmsg; - return; - } - } - - new_session_dialog->set_session_name (name); - new_session_dialog->set_session_folder (Glib::path_get_basename (path)); - _session_is_new = isnew; - } - - hide_splash (); - - bool have_backend = EngineControl::engine_running(); - bool need_nsd; - bool load_needed = false; - - if (have_backend) { - - /* backend audio is working */ - - if (ARDOUR_COMMAND_LINE::session_name.empty() || ARDOUR_COMMAND_LINE::new_session) { - /* need NSD to get session name and other info */ - need_nsd = true; - } else { - need_nsd = false; - } - - } else { - - XMLNode* audio_setup = Config->extra_xml ("AudioSetup"); - - if (audio_setup) { - new_session_dialog->engine_control.set_state (*audio_setup); - } - - /* no backend audio, must bring up NSD to check configuration */ - - need_nsd = true; - } - - if (need_nsd) { - - if (!get_session_parameters (ARDOUR_COMMAND_LINE::session_name, have_backend, ARDOUR_COMMAND_LINE::new_session)) { - return; - } - - } else { - - if (create_engine ()) { - backend_audio_error (false); - exit (1); - } + new_session_dialog = new NewSessionDialog(); - load_needed = true; + bool backend_audio_is_running = EngineControl::engine_running(); + XMLNode* audio_setup = Config->extra_xml ("AudioSetup"); + + if (audio_setup) { + new_session_dialog->engine_control.set_state (*audio_setup); } - if (load_needed) { - if (load_session (ARDOUR_COMMAND_LINE::session_name, name)) { - return; - } + if (!get_session_parameters (backend_audio_is_running, ARDOUR_COMMAND_LINE::new_session)) { + return; } - + + BootMessage (_("Ardour is ready for use")); show (); } @@ -753,6 +708,8 @@ ARDOUR_UI::check_memory_locking () cb.show(); vbox->show(); hbox.show (); + + pop_back_splash (); editor->ensure_float (msg); msg.run (); @@ -766,35 +723,43 @@ ARDOUR_UI::check_memory_locking () void ARDOUR_UI::finish() { - if (session && session->dirty()) { - switch (ask_about_saving_session(_("quit"))) { - case -1: - return; - break; - case 1: - /* use the default name */ - if (save_state_canfail ("")) { - /* failed - don't quit */ - MessageDialog msg (*editor, - _("\ + if (session) { + + if (session->transport_rolling()) { + session->request_stop (); + usleep (2500000); + } + + if (session->dirty()) { + switch (ask_about_saving_session(_("quit"))) { + case -1: + return; + break; + case 1: + /* use the default name */ + if (save_state_canfail ("")) { + /* failed - don't quit */ + MessageDialog msg (*editor, + _("\ Ardour was unable to save your session.\n\n\ If you still wish to quit, please use the\n\n\ \"Just quit\" option.")); - msg.run (); - return; + pop_back_splash(); + msg.run (); + return; + } + break; + case 0: + break; } - break; - case 0: - break; } - } - - if (session) { + session->set_deletion_in_progress (); } + + ArdourDialog::close_all_dialogs (); engine->stop (true); - Config->save_state(); - ARDOUR_UI::config()->save_state(); + save_ardour_state (); quit (); } @@ -835,8 +800,7 @@ ARDOUR_UI::ask_about_saving_session (const string & what) prompt_label.set_name (X_("PrompterLabel")); prompt_label.set_alignment(ALIGN_LEFT, ALIGN_TOP); - dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP) -; + dimage->set_alignment(ALIGN_CENTER, ALIGN_TOP); dhbox.set_homogeneous (false); dhbox.pack_start (*dimage, false, false, 5); dhbox.pack_start (prompt_label, true, false, 5); @@ -851,9 +815,6 @@ ARDOUR_UI::ask_about_saving_session (const string & what) prompt_label.show(); dimage->show(); window.show(); - - save_the_session = 0; - window.set_keep_above (true); window.present (); @@ -968,15 +929,11 @@ ARDOUR_UI::update_disk_space() nframes_t frames = session->available_capture_duration(); char buf[64]; - + nframes_t fr = session->frame_rate(); + if (frames == max_frames) { strcpy (buf, _("Disk: 24hrs+")); } else { - int hrs; - int mins; - int secs; - nframes_t fr = session->frame_rate(); - rec_enabled_streams = 0; session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams); @@ -984,16 +941,29 @@ ARDOUR_UI::update_disk_space() frames /= rec_enabled_streams; } + int hrs; + int mins; + int secs; + hrs = frames / (fr * 3600); frames -= hrs * fr * 3600; mins = frames / (fr * 60); frames -= mins * fr * 60; secs = frames / fr; - + snprintf (buf, sizeof(buf), _("Disk: %02dh:%02dm:%02ds"), hrs, mins, secs); } - + disk_space_label.set_text (buf); + + // An attempt to make the disk space label flash red when space has run out. + + if (frames < fr * 60 * 5) { + /* disk_space_box.style ("disk_space_label_empty"); */ + } else { + /* disk_space_box.style ("disk_space_label"); */ + } + } gint @@ -1052,8 +1022,27 @@ ARDOUR_UI::redisplay_recent_sessions () get_state_files_in_directory (*i, state_file_paths); - if (state_file_paths.empty()) { - // no state file? + vector* states; + vector item; + string fullpath = (*i).to_string(); + + /* remove any trailing / */ + + if (fullpath[fullpath.length()-1] == '/') { + fullpath = fullpath.substr (0, fullpath.length()-1); + } + + /* check whether session still exists */ + if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) { + /* session doesn't exist */ + cerr << "skipping non-existent session " << fullpath << endl; + continue; + } + + /* now get available states for this session */ + + if ((states = Session::possible_states (fullpath)) == 0) { + /* no state file? */ continue; } @@ -1061,8 +1050,6 @@ ARDOUR_UI::redisplay_recent_sessions () Gtk::TreeModel::Row row = *(recent_session_model->append()); - const string fullpath = (*i).to_string(); - row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_session_columns.fullpath] = fullpath; @@ -1099,8 +1086,7 @@ ARDOUR_UI::build_session_selector () recent_session_display.set_model (recent_session_model); recent_session_display.append_column (_("Recent Sessions"), recent_session_columns.visible_name); recent_session_display.set_headers_visible (false); - recent_session_display.get_selection()->set_mode (SELECTION_SINGLE); - + recent_session_display.get_selection()->set_mode (SELECTION_BROWSE); recent_session_display.signal_row_activated().connect (mem_fun (*this, &ARDOUR_UI::recent_session_row_activated)); scroller->add (recent_session_display); @@ -1124,64 +1110,55 @@ ARDOUR_UI::recent_session_row_activated (const TreePath& path, TreeViewColumn* c void ARDOUR_UI::open_recent_session () { - /* popup selector window */ + bool can_return = (session != 0); if (session_selector_window == 0) { build_session_selector (); } - - redisplay_recent_sessions (); - - ResponseType r = (ResponseType) session_selector_window->run (); - - session_selector_window->hide(); - - switch (r) { - case RESPONSE_ACCEPT: - break; - default: - return; - } - - Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected(); - - if (i == recent_session_model->children().end()) { - return; - } - Glib::ustring path = (*i)[recent_session_columns.fullpath]; - Glib::ustring state = (*i)[recent_session_columns.visible_name]; - - _session_is_new = false; + redisplay_recent_sessions (); - load_session (path, state); -} + while (true) { + + session_selector_window->set_position (WIN_POS_MOUSE); -bool -ARDOUR_UI::filter_ardour_session_dirs (const FileFilter::Info& info) -{ - struct stat statbuf; + ResponseType r = (ResponseType) session_selector_window->run (); + + switch (r) { + case RESPONSE_ACCEPT: + break; + default: + if (can_return) { + session_selector_window->hide(); + return; + } else { + exit (1); + } + } - if (stat (info.filename.c_str(), &statbuf) != 0) { - return false; - } + if (recent_session_display.get_selection()->count_selected_rows() == 0) { + continue; + } + + session_selector_window->hide(); - if (!S_ISDIR(statbuf.st_mode)) { - return false; - } + Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected(); + + if (i == recent_session_model->children().end()) { + return; + } + + Glib::ustring path = (*i)[recent_session_columns.fullpath]; + Glib::ustring state = (*i)[recent_session_columns.visible_name]; + + _session_is_new = false; + + if (load_session (path, state) == 0) { + break; + } - // XXX Portability - - string session_file = info.filename; - session_file += '/'; - session_file += Glib::path_get_basename (info.filename); - session_file += ".ardour"; - - if (stat (session_file.c_str(), &statbuf) != 0) { - return false; + can_return = false; } - - return S_ISREG (statbuf.st_mode); } bool @@ -1191,6 +1168,7 @@ ARDOUR_UI::check_audioengine () if (!engine->connected()) { MessageDialog msg (_("Ardour is not connected to JACK\n" "You cannot open or close sessions in this condition")); + pop_back_splash (); msg.run (); return false; } @@ -1342,12 +1320,12 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t } catch (...) { - cerr << "About to complain about JACK\n"; MessageDialog msg (*editor, _("There are insufficient JACK ports available\n\ to create a new track or bus.\n\ You should save Ardour, exit and\n\ restart JACK with more ports.")); + pop_back_splash (); msg.run (); } } @@ -1372,7 +1350,7 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position) } void -ARDOUR_UI::transport_goto_start () +ARDOUR_UI::transport_goto_start () { if (session) { session->goto_start(); @@ -1405,6 +1383,34 @@ ARDOUR_UI::transport_goto_zero () } } +void +ARDOUR_UI::transport_goto_wallclock () +{ + if (session && editor) { + + time_t now; + struct tm tmnow; + nframes64_t frames; + + time (&now); + localtime_r (&now, &tmnow); + + frames = tmnow.tm_hour * (60 * 60 * session->frame_rate()); + frames += tmnow.tm_min * (60 * session->frame_rate()); + frames += tmnow.tm_sec * session->frame_rate(); + + session->request_locate (frames); + + /* force displayed area in editor to start no matter + what "follow playhead" setting is. + */ + + if (editor) { + editor->reset_x_origin (frames - (editor->current_page_frames()/2)); + } + } +} + void ARDOUR_UI::transport_goto_end () { @@ -1458,8 +1464,9 @@ ARDOUR_UI::remove_last_capture() } void -ARDOUR_UI::transport_record () +ARDOUR_UI::transport_record (bool roll) { + if (session) { switch (session->record_status()) { case Session::Disabled: @@ -1469,12 +1476,23 @@ ARDOUR_UI::transport_record () return; } session->maybe_enable_record (); + if (roll) { + transport_roll (); + } break; case Session::Recording: + if (roll) { + session->request_stop(); + } else { + session->disable_record (false, true); + } + break; + case Session::Enabled: session->disable_record (false, true); } } + //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " session->record_status() = " << session->record_status() << endl; } void @@ -1488,6 +1506,8 @@ ARDOUR_UI::transport_roll () rolling = session->transport_rolling (); + //cerr << "ARDOUR_UI::transport_roll () called session->record_status() = " << session->record_status() << endl; + if (session->get_play_loop()) { session->request_play_loop (false); auto_loop_button.set_visual_state (1); @@ -1712,8 +1732,9 @@ ARDOUR_UI::engine_halted () _("\ JACK has either been shutdown or it\n\ disconnected Ardour because Ardour\n\ -was not fast enough. You can save the\n\ -session and/or try to reconnect to JACK .")); +was not fast enough. Try to restart\n\ +JACK, reconnect and save the session.")); + pop_back_splash (); msg.run (); } @@ -1745,7 +1766,7 @@ void ARDOUR_UI::update_clocks () { if (!editor || !editor->dragging_playhead()) { - Clock (session->audible_frame(), false, editor->edit_cursor_position(false)); /* EMIT_SIGNAL */ + Clock (session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */ } } @@ -1906,21 +1927,18 @@ ARDOUR_UI::save_state_canfail (string name) } void -ARDOUR_UI::restore_state (string name) +ARDOUR_UI::primary_clock_value_changed () { if (session) { - if (name.length() == 0) { - name = session->name(); - } - session->restore_state (name); + session->request_locate (primary_clock.current_time ()); } } void -ARDOUR_UI::primary_clock_value_changed () +ARDOUR_UI::big_clock_value_changed () { if (session) { - session->request_locate (primary_clock.current_time ()); + session->request_locate (big_clock.current_time ()); } } @@ -1932,37 +1950,6 @@ ARDOUR_UI::secondary_clock_value_changed () } } -void -ARDOUR_UI::rec_enable_button_blink (bool onoff, AudioDiskstream *dstream, Widget *w) -{ - if (session && dstream && dstream->record_enabled()) { - - Session::RecordState rs; - - rs = session->record_status (); - - switch (rs) { - case Session::Disabled: - case Session::Enabled: - if (w->get_state() != STATE_SELECTED) { - w->set_state (STATE_SELECTED); - } - break; - - case Session::Recording: - if (w->get_state() != STATE_ACTIVE) { - w->set_state (STATE_ACTIVE); - } - break; - } - - } else { - if (w->get_state() != STATE_NORMAL) { - w->set_state (STATE_NORMAL); - } - } -} - void ARDOUR_UI::transport_rec_enable_blink (bool onoff) { @@ -1989,14 +1976,6 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff) } } -gint -ARDOUR_UI::hide_and_quit (GdkEventAny *ev, ArdourDialog *window) -{ - window->hide(); - Gtk::Main::quit (); - return TRUE; -} - void ARDOUR_UI::save_template () @@ -2027,311 +2006,459 @@ ARDOUR_UI::save_template () } } -bool -ARDOUR_UI::get_session_parameters (Glib::ustring predetermined_path, bool have_engine, bool should_be_new) +void +ARDOUR_UI::edit_metadata () +{ + SessionMetadataEditor dialog; + dialog.set_session (session); + editor->ensure_float (dialog); + dialog.run (); +} + +void +ARDOUR_UI::import_metadata () +{ + SessionMetadataImporter dialog; + dialog.set_session (session); + editor->ensure_float (dialog); + dialog.run (); +} + +void +ARDOUR_UI::fontconfig_dialog () +{ +#ifdef GTKOSX + /* X11 users will always have fontconfig info around, but new GTK-OSX users + may not and it can take a while to build it. Warn them. + */ + + Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig"); + + if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) { + MessageDialog msg (*new_session_dialog, + _("Welcome to Ardour.\n\n" + "The program will take a bit longer to start up\n" + "while the system fonts are checked.\n\n" + "This will only be done once, and you will\n" + "not see this message again\n"), + true, + Gtk::MESSAGE_INFO, + Gtk::BUTTONS_OK); + pop_back_splash (); + msg.show_all (); + msg.present (); + msg.run (); + } +#endif +} + +void +ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session) +{ + existing_session = false; + + if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_DIR)) { + session_path = cmdline_path; + existing_session = true; + } else if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_REGULAR)) { + session_path = Glib::path_get_dirname (string (cmdline_path)); + existing_session = true; + } else { + /* it doesn't exist, assume the best */ + session_path = Glib::path_get_dirname (string (cmdline_path)); + } + + session_name = basename_nosuffix (string (cmdline_path)); +} + +int +ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session) { - string session_name; - string session_path; - string template_name; + /* when this is called, the backend audio system must be running */ + + /* the main idea here is to deal with the fact that a cmdline argument for the session + can be interpreted in different ways - it could be a directory or a file, and before + we load, we need to know both the session directory and the snapshot (statefile) within it + that we are supposed to use. + */ - if (!loading_dialog) { - loading_dialog = new MessageDialog (*new_session_dialog, - "", - false, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_NONE); + if (session_name.length() == 0 || session_path.length() == 0) { + return false; } + + if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) { + + Glib::ustring predicted_session_file; + + predicted_session_file = session_path; + predicted_session_file += '/'; + predicted_session_file += session_name; + predicted_session_file += ARDOUR::statefile_suffix; + + if (Glib::file_test (predicted_session_file, Glib::FILE_TEST_EXISTS)) { + existing_session = true; + } - int response = Gtk::RESPONSE_NONE; + } else if (Glib::file_test (session_path, Glib::FILE_TEST_EXISTS)) { + + if (session_path.find (ARDOUR::statefile_suffix) == session_path.length() - 7) { + /* existing .ardour file */ + existing_session = true; + } - new_session_dialog->set_modal(true); - new_session_dialog->set_name (predetermined_path); - new_session_dialog->reset_recent(); + } else { + existing_session = false; + } + + /* lets just try to load it */ + + if (create_engine ()) { + backend_audio_error (false, new_session_dialog); + return -1; + } + + return load_session (session_path, session_name); +} + +bool +ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path) +{ + Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path); + + MessageDialog msg (str, + false, + Gtk::MESSAGE_WARNING, + Gtk::BUTTONS_YES_NO, + true); + + + msg.set_name (X_("CleanupDialog")); + msg.set_wmclass (X_("existing_session"), "Ardour"); + msg.set_position (Gtk::WIN_POS_MOUSE); + pop_back_splash (); + + switch (msg.run()) { + case RESPONSE_YES: + return true; + break; + } + return false; +} + +int +ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name) +{ + + uint32_t cchns; + uint32_t mchns; + AutoConnectOption iconnect; + AutoConnectOption oconnect; + uint32_t nphysin; + uint32_t nphysout; + + if (Profile->get_sae()) { + + cchns = 0; + mchns = 2; + iconnect = AutoConnectPhysical; + oconnect = AutoConnectMaster; + nphysin = 0; // use all available + nphysout = 0; // use all available + + } else { + + /* get settings from advanced section of NSD */ + + if (new_session_dialog->create_control_bus()) { + cchns = (uint32_t) new_session_dialog->control_channel_count(); + } else { + cchns = 0; + } + + if (new_session_dialog->create_master_bus()) { + mchns = (uint32_t) new_session_dialog->master_channel_count(); + } else { + mchns = 0; + } + + if (new_session_dialog->connect_inputs()) { + iconnect = AutoConnectPhysical; + } else { + iconnect = AutoConnectOption (0); + } + + /// @todo some minor tweaks. + + if (new_session_dialog->connect_outs_to_master()) { + oconnect = AutoConnectMaster; + } else if (new_session_dialog->connect_outs_to_physical()) { + oconnect = AutoConnectPhysical; + } else { + oconnect = AutoConnectOption (0); + } + + nphysin = (uint32_t) new_session_dialog->input_limit_count(); + nphysout = (uint32_t) new_session_dialog->output_limit_count(); + } + + if (build_session (session_path, + session_name, + cchns, + mchns, + iconnect, + oconnect, + nphysin, + nphysout, + engine->frame_rate() * 60 * 5)) { + + return -1; + } + + return 0; +} + +void +ARDOUR_UI::end_loading_messages () +{ + // hide_splash (); +} + +void +ARDOUR_UI::loading_message (const std::string& msg) +{ + show_splash (); + splash->message (msg); + flush_pending (); +} + +void +ARDOUR_UI::idle_load (const Glib::ustring& path) +{ + if (session) { + if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) { + /* /path/to/foo => /path/to/foo, foo */ + load_session (path, basename_nosuffix (path)); + } else { + /* /path/to/foo/foo.ardour => /path/to/foo, foo */ + load_session (Glib::path_get_dirname (path), basename_nosuffix (path)); + } + } else { + + ARDOUR_COMMAND_LINE::session_name = path; + + if (new_session_dialog) { + + + /* make it break out of Dialog::run() and + start again. + */ + + new_session_dialog->response (1); + } + } +} + +/** @param offer_quit true to offer a Cancel button, otherwise call it Quit */ +bool +ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new, bool offer_cancel) +{ + bool existing_session = false; + Glib::ustring session_name; + Glib::ustring session_path; + Glib::ustring template_name; + int response; + + begin: + response = Gtk::RESPONSE_NONE; + + if (!ARDOUR_COMMAND_LINE::session_name.empty()) { + + parse_cmdline_path (ARDOUR_COMMAND_LINE::session_name, session_name, session_path, existing_session); + + /* don't ever reuse this */ + + ARDOUR_COMMAND_LINE::session_name = string(); + + if (existing_session && backend_audio_is_running) { + + /* just load the thing already */ + + if (load_cmdline_session (session_name, session_path, existing_session) == 0) { + return true; + } + } + + /* make the NSD use whatever information we have */ + + new_session_dialog->set_session_name (session_name); + new_session_dialog->set_session_folder (session_path); + } + + /* loading failed, or we need the NSD for something */ + + new_session_dialog->set_modal (false); new_session_dialog->set_position (WIN_POS_CENTER); new_session_dialog->set_current_page (0); + new_session_dialog->set_existing_session (existing_session); + new_session_dialog->reset_recent(); + new_session_dialog->set_offer_cancel (offer_cancel); do { - new_session_dialog->set_have_engine (have_engine); - - new_session_dialog->show(); + new_session_dialog->set_have_engine (backend_audio_is_running); new_session_dialog->present (); - response = new_session_dialog->run (); - + end_loading_messages (); + response = new_session_dialog->run (); + _session_is_new = false; + + /* handle possible negative responses */ - if (response == Gtk::RESPONSE_CANCEL || response == Gtk::RESPONSE_DELETE_EVENT) { + switch (response) { + case 1: + /* sent by idle_load, meaning restart the whole process again */ + new_session_dialog->hide(); + new_session_dialog->reset(); + goto begin; + break; + case Gtk::RESPONSE_CANCEL: + case Gtk::RESPONSE_DELETE_EVENT: if (!session) { + if (engine && engine->running()) { + engine->stop (true); + } quit(); } new_session_dialog->hide (); return false; - - } else if (response == Gtk::RESPONSE_NONE) { - - /* Clear was pressed */ - new_session_dialog->reset(); - continue; + + case Gtk::RESPONSE_NONE: + /* "Clear" was pressed */ + goto try_again; } - /* first things first ... if we're here to help set up audio parameters - this is where want to do that. - */ + fontconfig_dialog(); - if (!have_engine) { - if (new_session_dialog->engine_control.setup_engine ()) { - new_session_dialog->hide (); + if (!backend_audio_is_running) { + int ret = new_session_dialog->engine_control.setup_engine (); + if (ret < 0) { return false; - } - } - -#ifdef GTKOSX - /* X11 users will always have fontconfig info around, but new GTK-OSX users - may not and it can take a while to build it. Warn them. - */ - - Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig"); - - if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) { - MessageDialog msg (*new_session_dialog, - _("Welcome to Ardour.\n\n" - "The program will take a bit longer to start up\n" - "while the system fonts are checked.\n\n" - "This will only be done once, and you will\n" - "not see this message again\n"), - true, - Gtk::MESSAGE_INFO, - Gtk::BUTTONS_OK); - msg.show_all (); - msg.present (); - msg.run (); + } else if (ret > 0) { + response = Gtk::RESPONSE_REJECT; + goto try_again; + } } -#endif - loading_dialog->set_message (_("Starting audio engine")); - loading_dialog->show_all (); - flush_pending (); if (create_engine ()) { - backend_audio_error (!have_engine, new_session_dialog); - loading_dialog->hide (); + + backend_audio_error (!backend_audio_is_running, new_session_dialog); flush_pending (); - /* audio setup page */ + + new_session_dialog->set_existing_session (false); new_session_dialog->set_current_page (2); - /* try again */ + response = Gtk::RESPONSE_NONE; - continue; + goto try_again; } - have_engine = true; + backend_audio_is_running = true; - /* now handle possible affirmative responses */ - - if (response == Gtk::RESPONSE_YES) { + if (response == Gtk::RESPONSE_OK) { - /* YES == OPEN from the session selector */ + session_name = new_session_dialog->session_name(); - session_name = new_session_dialog->session_name(); - if (session_name.empty()) { response = Gtk::RESPONSE_NONE; - continue; + goto try_again; } + /* if the user mistakenly typed path information into the session filename entry, + convert what they typed into a path & a name + */ + if (session_name[0] == '/' || (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') || (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) { - load_session (Glib::path_get_dirname (session_name), session_name); + + session_path = Glib::path_get_dirname (session_name); + session_name = Glib::path_get_basename (session_name); + } else { + session_path = new_session_dialog->session_folder(); - load_session (session_path, session_name); } - - } else if (response == Gtk::RESPONSE_OK) { - /* OK == OPEN button */ + template_name = Glib::ustring(); + switch (new_session_dialog->which_page()) { - session_name = new_session_dialog->session_name(); - - if (session_name.empty()) { - response = Gtk::RESPONSE_NONE; - continue; - } - - switch (new_session_dialog->get_current_page()) { - case 1: /* recent session selector */ - case 2: /* audio engine control */ - - if (session_name[0] == '/' || - (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') || - (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) { - load_session (Glib::path_get_dirname (session_name), session_name); - } else { - session_path = new_session_dialog->session_folder(); - load_session (session_path, session_name); - } + case NewSessionDialog::OpenPage: + case NewSessionDialog::EnginePage: + goto loadit; break; - case 0: /* nominally the "new" session creator, but could be in use for an old session */ - - if (new_session_dialog->get_current_page() == 0 && ARDOUR_COMMAND_LINE::session_name.empty()) { - should_be_new = true; - } - - /* handle what appear to be paths rather than just a name */ - - if (session_name[0] == '/' || - (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') || - (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) { - - session_path = Glib::path_get_dirname (session_name); - session_name = Glib::path_get_basename (session_name); - - } else { - - session_path = new_session_dialog->session_folder(); - - } + case NewSessionDialog::NewPage: /* nominally the "new" session creator, but could be in use for an old session */ + + should_be_new = true; //XXX This is needed because session constructor wants a //non-existant path. hopefully this will be fixed at some point. session_path = Glib::build_filename (session_path, session_name); - - if (!should_be_new) { - - load_session (session_path, session_name); - continue; /* leaves while() loop because response != NONE */ - - } else if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { - - Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path); - - MessageDialog msg (str, - false, - Gtk::MESSAGE_WARNING, - Gtk::BUTTONS_YES_NO, - true); - - - msg.set_name (X_("CleanupDialog")); - msg.set_wmclass (X_("existing_session"), "Ardour"); - msg.set_position (Gtk::WIN_POS_MOUSE); - - switch (msg.run()) { - case RESPONSE_YES: - new_session_dialog->hide (); - goto_editor_window (); - flush_pending (); - load_session (session_path, session_name); - goto done; - break; - default: + + if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) { + + if (ask_about_loading_existing_session (session_path)) { + goto loadit; + } else { response = RESPONSE_NONE; - new_session_dialog->reset (); - continue; - } - } + goto try_again; + } + } _session_is_new = true; if (new_session_dialog->use_session_template()) { template_name = new_session_dialog->session_template_name(); - - new_session_dialog->hide (); - goto_editor_window (); - flush_pending (); - - load_session (session_path, session_name, &template_name); + goto loadit; } else { - - uint32_t cchns; - uint32_t mchns; - AutoConnectOption iconnect; - AutoConnectOption oconnect; - uint32_t nphysin; - uint32_t nphysout; - - if (Profile->get_sae()) { - - cchns = 0; - mchns = 2; - iconnect = AutoConnectPhysical; - oconnect = AutoConnectMaster; - nphysin = 0; // use all available - nphysout = 0; // use all available - - } else { - - /* get settings from advanced section of NSD */ - - if (new_session_dialog->create_control_bus()) { - cchns = (uint32_t) new_session_dialog->control_channel_count(); - } else { - cchns = 0; - } - - if (new_session_dialog->create_master_bus()) { - mchns = (uint32_t) new_session_dialog->master_channel_count(); - } else { - mchns = 0; - } - - if (new_session_dialog->connect_inputs()) { - iconnect = AutoConnectPhysical; - } else { - iconnect = AutoConnectOption (0); - } - - /// @todo some minor tweaks. - - if (new_session_dialog->connect_outs_to_master()) { - oconnect = AutoConnectMaster; - } else if (new_session_dialog->connect_outs_to_physical()) { - oconnect = AutoConnectPhysical; - } else { - oconnect = AutoConnectOption (0); - } - - nphysin = (uint32_t) new_session_dialog->input_limit_count(); - nphysout = (uint32_t) new_session_dialog->output_limit_count(); - } - - new_session_dialog->hide (); - goto_editor_window (); - flush_pending (); - - if (build_session (session_path, - session_name, - cchns, - mchns, - iconnect, - oconnect, - nphysin, - nphysout, - engine->frame_rate() * 60 * 5)) { - - response = Gtk::RESPONSE_NONE; - new_session_dialog->reset (); - continue; + if (build_session_from_nsd (session_path, session_name)) { + response = RESPONSE_NONE; + goto try_again; } + goto done; } break; - + default: break; } + + loadit: + new_session_dialog->hide (); + + if (load_session (session_path, session_name, template_name)) { + /* force a retry */ + response = Gtk::RESPONSE_NONE; + } + + try_again: + if (response == Gtk::RESPONSE_NONE) { + new_session_dialog->set_existing_session (false); + new_session_dialog->reset (); + } } - - } while (response == Gtk::RESPONSE_NONE); + + } while (response == Gtk::RESPONSE_NONE || response == Gtk::RESPONSE_REJECT); done: show(); - loading_dialog->hide (); new_session_dialog->hide(); + new_session_dialog->reset(); + goto_editor_window (); return true; -} +} void ARDOUR_UI::close_session() @@ -2342,11 +2469,11 @@ ARDOUR_UI::close_session() unload_session (true); - get_session_parameters ("", true, false); + get_session_parameters (true, false); } int -ARDOUR_UI::load_session (const string & path, const string & snap_name, string* mix_template) +ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_name, Glib::ustring mix_template) { Session *new_session; int unload_status; @@ -2369,26 +2496,71 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string* /* if it already exists, we must have write access */ - if (::access (path.c_str(), F_OK) == 0 && ::access (path.c_str(), W_OK)) { + if (Glib::file_test (path.c_str(), Glib::FILE_TEST_EXISTS) && ::access (path.c_str(), W_OK)) { MessageDialog msg (*editor, _("You do not have write access to this session.\n" "This prevents the session from being loaded.")); + pop_back_splash (); msg.run (); goto out; } - if (loading_dialog) { - loading_dialog->set_markup (_("Please wait while Ardour loads your session")); - flush_pending (); - } - - disable_screen_updates (); + loading_message (_("Please wait while Ardour loads your session")); try { new_session = new Session (*engine, path, snap_name, mix_template); } + /* this one is special */ + + catch (AudioEngine::PortRegistrationFailure& err) { + + MessageDialog msg (err.what(), + true, + Gtk::MESSAGE_INFO, + Gtk::BUTTONS_CLOSE); + + msg.set_title (_("Port Registration Error")); + msg.set_secondary_text (_("Click the Close button to try again.")); + msg.set_position (Gtk::WIN_POS_CENTER); + pop_back_splash (); + msg.present (); + + int response = msg.run (); + + msg.hide (); + + switch (response) { + case RESPONSE_CANCEL: + exit (1); + default: + break; + } + goto out; + } + catch (...) { - error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg; + + MessageDialog msg (string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name), + true, + Gtk::MESSAGE_INFO, + Gtk::BUTTONS_CLOSE); + + msg.set_title (_("Loading Error")); + msg.set_secondary_text (_("Click the Close button to try again.")); + msg.set_position (Gtk::WIN_POS_CENTER); + pop_back_splash (); + msg.present (); + + int response = msg.run (); + + msg.hide (); + + switch (response) { + case RESPONSE_CANCEL: + exit (1); + default: + break; + } goto out; } @@ -2404,8 +2576,6 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string* session->set_clean (); } - editor->edit_cursor_position (true); - enable_screen_updates (); flush_pending (); retval = 0; @@ -2414,7 +2584,7 @@ ARDOUR_UI::load_session (const string & path, const string & snap_name, string* } int -ARDOUR_UI::build_session (const string & path, const string & snap_name, +ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, uint32_t control_channels, uint32_t master_channels, AutoConnectOption input_connect, @@ -2450,6 +2620,7 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name, catch (...) { MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path)); + pop_back_splash (); msg.run (); return -1; } @@ -2457,6 +2628,9 @@ ARDOUR_UI::build_session (const string & path, const string & snap_name, connect_to_session (new_session); session_loaded = true; + + new_session->save_state(new_session->name()); + return 0; } @@ -2475,28 +2649,54 @@ ARDOUR_UI::show () } void -ARDOUR_UI::show_splash () +ARDOUR_UI::show_about () { if (about == 0) { - about = new About(); + about = new About; about->signal_response().connect(mem_fun (*this, &ARDOUR_UI::about_signal_response) ); } - about->present(); - flush_pending (); + + about->show_all (); +} + +void +ARDOUR_UI::hide_about () +{ + if (about) { + about->get_window()->set_cursor (); + about->hide (); + } } void ARDOUR_UI::about_signal_response(int response) { - hide_splash(); + hide_about(); +} + +void +ARDOUR_UI::show_splash () +{ + if (splash == 0) { + try { + splash = new Splash; + } catch (...) { + return; + } + } + + splash->show (); + splash->present (); + splash->queue_draw (); + splash->get_window()->process_updates (true); + flush_pending (); } void ARDOUR_UI::hide_splash () { - if (about) { - about->get_window()->set_cursor (); - about->hide(); + if (splash) { + splash->hide(); } } @@ -2655,8 +2855,11 @@ After cleanup, unused audio files will be moved to a \ } if (session->cleanup_sources (rep)) { + editor->finish_cleanup (); return; } + + editor->finish_cleanup (); checker.hide(); display_cleanup_results (rep, @@ -2670,8 +2873,6 @@ release an additional\n\ %4 %5bytes of disk space.\n" )); - - } void @@ -2746,7 +2947,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window) } /* XXX do something with name template */ - + if (add_route_dialog->type() == ARDOUR::DataType::MIDI) { if (track) { session_add_midi_track(count); @@ -2793,10 +2994,17 @@ ARDOUR_UI::editor_settings () const } else { node = Config->instant_xml(X_("Editor")); } + + if (!node) { + if (getenv("ARDOUR_INSTANT_XML_PATH")) { + node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH")); + } + } if (!node) { node = new XMLNode (X_("Editor")); } + return node; } @@ -2814,15 +3022,37 @@ ARDOUR_UI::keyboard_settings () const } void -ARDOUR_UI::halt_on_xrun_message () +ARDOUR_UI::create_xrun_marker(nframes_t where) { - ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message)); + editor->mouse_add_new_marker (where, false, true); +} +void +ARDOUR_UI::halt_on_xrun_message () +{ MessageDialog msg (*editor, _("Recording was stopped because your system could not keep up.")); msg.run (); } +void +ARDOUR_UI::xrun_handler(nframes_t where) +{ + if (!session) { + return; + } + + ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::xrun_handler), where)); + + if (session && Config->get_create_xrun_marker() && session->actively_recording()) { + create_xrun_marker(where); + } + + if (session && Config->get_stop_recording_on_xrun() && session->actively_recording()) { + halt_on_xrun_message (); + } +} + void ARDOUR_UI::disk_overrun_handler () { @@ -2866,12 +3096,30 @@ ARDOUR_UI::disk_speed_dialog_gone (int ignored_response, MessageDialog* msg) delete msg; } +void +ARDOUR_UI::session_dialog (std::string msg) +{ + ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::session_dialog), msg)); + + MessageDialog* d; + + if (editor) { + d = new MessageDialog (*editor, msg, false, MESSAGE_INFO, BUTTONS_OK, true); + } else { + d = new MessageDialog (msg, false, MESSAGE_INFO, BUTTONS_OK, true); + } + + d->show_all (); + d->run (); + delete d; +} + int ARDOUR_UI::pending_state_dialog () { HBox* hbox = new HBox(); Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG); - ArdourDialog dialog (_("Crash recovery"), true); + ArdourDialog dialog (_("Crash Recovery"), true); Label message (_("\ This session appears to have been in\n\ middle of recording when ardour or\n\ @@ -2880,7 +3128,7 @@ the computer was shutdown.\n\ Ardour can recover any captured audio for\n\ you, or it can ignore it. Please decide\n\ what you would like to do.\n")); - + image->set_alignment(ALIGN_CENTER, ALIGN_TOP); hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12); hbox->pack_end (message, PACK_EXPAND_PADDING, 12); dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6); @@ -2891,8 +3139,7 @@ what you would like to do.\n")); message.show(); image->show(); hbox->show(); - //dialog.get_vbox()->show(); - + switch (dialog.run ()) { case RESPONSE_ACCEPT: return 1; @@ -2900,6 +3147,38 @@ what you would like to do.\n")); return 0; } } + +int +ARDOUR_UI::sr_mismatch_dialog (nframes_t desired, nframes_t actual) +{ + HBox* hbox = new HBox(); + Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG); + ArdourDialog dialog (_("Sample Rate Mismatch"), true); + Label message (string_compose (_("\ +This session was created with a sample rate of %1 Hz\n\ +\n\ +The audioengine is currently running at %2 Hz\n"), desired, actual)); + + image->set_alignment(ALIGN_CENTER, ALIGN_TOP); + hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12); + hbox->pack_end (message, PACK_EXPAND_PADDING, 12); + dialog.get_vbox()->pack_start(*hbox, PACK_EXPAND_PADDING, 6); + dialog.add_button (_("Do not load session"), RESPONSE_REJECT); + dialog.add_button (_("Load session anyway"), RESPONSE_ACCEPT); + dialog.set_default_response (RESPONSE_ACCEPT); + dialog.set_position (WIN_POS_CENTER); + message.show(); + image->show(); + hbox->show(); + + switch (dialog.run ()) { + case RESPONSE_ACCEPT: + return 0; + default: + return 1; + } +} + void ARDOUR_UI::disconnect_from_jack () @@ -2927,27 +3206,6 @@ ARDOUR_UI::reconnect_to_jack () } } -int -ARDOUR_UI::cmdline_new_session (string path) -{ - if (path[0] != '/') { - char buf[PATH_MAX+1]; - string str; - - getcwd (buf, sizeof (buf)); - str = buf; - str += '/'; - str += path; - path = str; - } - - get_session_parameters (path, false, true); - - _will_create_new_session_automatically = false; /* done it */ - - return FALSE; /* don't call it again */ -} - void ARDOUR_UI::use_config () { @@ -3009,13 +3267,13 @@ void ARDOUR_UI::update_transport_clocks (nframes_t pos) { if (Config->get_primary_clock_delta_edit_cursor()) { - primary_clock.set (pos, false, editor->edit_cursor_position(false), 'p'); + primary_clock.set (pos, false, editor->get_preferred_edit_position(), 1); } else { primary_clock.set (pos, 0, true); } if (Config->get_secondary_clock_delta_edit_cursor()) { - secondary_clock.set (pos, false, editor->edit_cursor_position(false), 's'); + secondary_clock.set (pos, false, editor->get_preferred_edit_position(), 2); } else { secondary_clock.set (pos); } @@ -3045,27 +3303,18 @@ ARDOUR_UI::record_state_changed () } } -void -ARDOUR_UI::set_keybindings_path (string path) -{ - keybindings_path = path; -} - -void -ARDOUR_UI::save_keybindings () -{ - if (can_save_keybindings) { - AccelMap::save (user_keybindings_path); - } -} - bool ARDOUR_UI::first_idle () { if (session) { session->allow_auto_play (true); } - can_save_keybindings = true; + + if (editor) { + editor->first_idle(); + } + + Keyboard::set_can_save_keybindings (true); return false; } @@ -3203,41 +3452,3 @@ ARDOUR_UI::setup_profile () } } -void -ARDOUR_UI::disable_all_plugins () -{ - if (!session) { - return; - } - - // session->begin_reversible_command (_("Disable all plugins")); - - boost::shared_ptr routes = session->get_routes (); - - for (Session::RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { - // XMLNode& before = (*i)->get_redirect_state (); - // session->add_command (new MementoCommand(**i, &before, 0)); - (*i)->disable_plugins (); - // XMLNode& after = (*i)->get_redirect_state (); - // session->add_command (new MementoCommand(**i, 0, &after)); - - } - - // session->commit_reversible_command (); -} - -void -ARDOUR_UI::ab_all_plugins () -{ - if (!session) { - return; - } - - boost::shared_ptr routes = session->get_routes (); - - for (Session::RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { - (*i)->ab_plugins (ab_direction); - } - - ab_direction = !ab_direction; -}