X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_dialog.cc;h=225b02df84ba3d42eab0748bacff1f232778db26;hb=004b57e9f67c6b818357759005c8e53b041dead4;hp=8e98de28680eb52a9e9b92cc4c62f70124be30fc;hpb=1d42ed077e555a83a93bac436547e7c378ee0c00;p=ardour.git diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc index 8e98de2868..225b02df84 100644 --- a/gtk2_ardour/session_dialog.cc +++ b/gtk2_ardour/session_dialog.cc @@ -21,15 +21,17 @@ #include "gtk2ardour-config.h" #endif -#include #include #include -#include +#include "pbd/gstdio_compat.h" + #include +#include #include +#include "pbd/basename.h" #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" #include "pbd/replace_all.h" @@ -38,6 +40,8 @@ #include "pbd/stl_delete.h" #include "pbd/openuri.h" +#include "gtkmm2ext/utils.h" + #include "ardour/audioengine.h" #include "ardour/filesystem_paths.h" #include "ardour/recent_sessions.h" @@ -50,8 +54,9 @@ #include "session_dialog.h" #include "opts.h" #include "engine_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #include "tooltips.h" +#include "ui_config.h" #include "utils.h" using namespace std; @@ -96,19 +101,19 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name, get_vbox()->pack_start (info_frame, false, false); setup_new_session_page (); - + if (!new_only) { setup_initial_choice_box (); get_vbox()->pack_start (ic_vbox, true, true); } else { get_vbox()->pack_start (session_new_vbox, true, true); } - + if (!template_name.empty()) { use_template_button.set_active (false); load_template_override = template_name; } - + get_vbox()->show_all (); /* fill data models and show/hide accordingly */ @@ -128,9 +133,11 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name, if (cnt > 0) { recent_scroller.show(); recent_label.show (); - + if (cnt > 4) { recent_scroller.set_size_request (-1, 300); + } else { + recent_scroller.set_size_request (-1, 80); } } else { recent_scroller.hide(); @@ -173,12 +180,16 @@ SessionDialog::SessionDialog () get_vbox()->pack_start (recent_scroller, true, true); get_vbox()->show_all (); + recent_scroller.show(); int cnt = redisplay_recent_sessions (); if (cnt > 4) { recent_scroller.set_size_request (-1, 300); + } else { + recent_scroller.set_size_request (-1, 80); } + } @@ -221,7 +232,7 @@ SessionDialog::session_template_name () TreeModel::Row row = (*iter); string s = row[session_template_columns.path]; return s; - } + } return string(); } @@ -237,9 +248,13 @@ SessionDialog::session_name (bool& should_be_new) /* Try recent session selection */ TreeIter iter = recent_session_display.get_selection()->get_selected(); - + if (iter) { should_be_new = false; + string s = (*iter)[recent_session_columns.fullpath]; + if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) { + return PBD::basename_nosuffix (s); + } return (*iter)[recent_session_columns.visible_name]; } @@ -263,9 +278,9 @@ SessionDialog::session_folder () } /* Try recent session selection */ - + TreeIter iter = recent_session_display.get_selection()->get_selected(); - + if (iter) { string s = (*iter)[recent_session_columns.fullpath]; if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) { @@ -333,16 +348,19 @@ SessionDialog::setup_initial_choice_box () string image_path; - if (find_file (ardour_data_search_path(), "small-splash.png", image_path)) { + Searchpath rc (ARDOUR::ardour_data_search_path()); + rc.add_subdirectory_to_paths ("resources"); + + if (find_file (rc, PROGRAM_NAME "-small-splash.png", image_path)) { Gtk::Image* image; if ((image = manage (new Gtk::Image (image_path))) != 0) { hbox->pack_start (*image, false, false); } } - + vbox->pack_start (ic_new_session_button, true, true, 20); hbox->pack_start (*vbox, true, true, 20); - + centering_vbox->pack_start (*hbox, false, false); /* Possible update message */ @@ -377,32 +395,41 @@ SessionDialog::setup_initial_choice_box () recent_scroller.set_no_show_all (true); recent_label.set_markup (string_compose ("%1", _("Recent Sessions"))); - + centering_vbox->pack_start (recent_label, false, false, 12); centering_vbox->pack_start (recent_scroller, true, true); /* Browse button */ - + existing_session_chooser.set_title (_("Select session file")); existing_session_chooser.signal_file_set().connect (sigc::mem_fun (*this, &SessionDialog::existing_session_selected)); existing_session_chooser.set_current_folder(poor_mans_glob (Config->get_default_session_parent_dir())); - + FileFilter session_filter; session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix)); session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME)); existing_session_chooser.add_filter (session_filter); existing_session_chooser.set_filter (session_filter); - -#ifdef GTKOSX - existing_session_chooser.add_shortcut_folder ("/Volumes"); -#endif - + + Gtkmm2ext::add_volume_shortcuts (existing_session_chooser); + Label* browse_label = manage (new Label); browse_label->set_markup (string_compose ("%1", _("Other Sessions"))); - + centering_vbox->pack_start (*browse_label, false, false, 12); centering_vbox->pack_start (existing_session_chooser, false, false); + /* --disable plugins UI */ + + _disable_plugins.set_label (_("Safe Mode: Disable all Plugins")); + _disable_plugins.set_flags (Gtk::CAN_FOCUS); + _disable_plugins.set_relief (Gtk::RELIEF_NORMAL); + _disable_plugins.set_mode (true); + _disable_plugins.set_active (ARDOUR::Session::get_disable_all_loaded_plugins()); + _disable_plugins.set_border_width(0); + _disable_plugins.signal_clicked().connect (sigc::mem_fun (*this, &SessionDialog::disable_plugins_clicked)); + centering_vbox->pack_start (_disable_plugins, false, false); + /* pack it all up */ centering_hbox->pack_start (*centering_vbox, true, true); @@ -536,12 +563,10 @@ SessionDialog::setup_new_session_page () new_folder_chooser.show (); new_folder_chooser.set_title (_("Select folder for session")); -#ifdef __APPLE__ - new_folder_chooser.add_shortcut_folder ("/Volumes"); -#endif + Gtkmm2ext::add_volume_shortcuts (new_folder_chooser); vbox1->pack_start (*hbox2, false, false); - + session_new_vbox.pack_start (*vbox1, false, false); /* --- */ @@ -564,20 +589,20 @@ SessionDialog::setup_new_session_page () HBox* hbox4a = manage (new HBox); use_template_button.set_label (_("Use this template")); - + TreeModel::Row row = *template_model->prepend (); row[session_template_columns.name] = (_("no template")); row[session_template_columns.path] = string(); - + hbox4a->set_spacing (6); hbox4a->pack_start (use_template_button, false, false); hbox4a->pack_start (template_chooser, true, true); - + template_chooser.set_model (template_model); - + Gtk::CellRendererText* text_renderer = Gtk::manage (new Gtk::CellRendererText); text_renderer->property_editable() = false; - + template_chooser.pack_start (*text_renderer); template_chooser.add_attribute (text_renderer->property_text(), session_template_columns.name); template_chooser.set_active (0); @@ -585,21 +610,21 @@ SessionDialog::setup_new_session_page () vbox3->pack_start (*hbox4a, false, false); /* --- */ - + HBox* hbox5 = manage (new HBox); - + hbox5->set_spacing (6); hbox5->pack_start (more_new_session_options_button, false, false); - + setup_more_options_box (); more_new_session_options_button.add (more_options_vbox); - + vbox3->pack_start (*hbox5, false, false); hbox3->pack_start (*vbox3, true, true, 8); vbox2->pack_start (*hbox3, false, false); - + /* --- */ - + session_new_vbox.pack_start (*vbox2, false, false); session_new_vbox.show_all (); } @@ -644,7 +669,7 @@ SessionDialog::redisplay_recent_sessions () for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) { session_directories.push_back ((*i).second); } - + int session_snapshot_count = 0; for (vector::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) @@ -690,28 +715,41 @@ SessionDialog::redisplay_recent_sessions () float sr; SampleFormat sf; - std::string state_file_basename = state_file_names.front(); + + std::string state_file_basename; + + if (state_file_names.size() > 1) { + state_file_basename = Session::get_snapshot_from_instant (dirname); + std::string s = Glib::build_filename (dirname, state_file_basename + statefile_suffix); + if (!Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) { + state_file_basename = ""; + } + } + + if (state_file_basename.empty()) { + state_file_basename = state_file_names.front(); + } std::string s = Glib::build_filename (dirname, state_file_basename + statefile_suffix); GStatBuf gsb; g_stat (s.c_str(), &gsb); - row[recent_session_columns.fullpath] = dirname; /* just the dir, but this works too */ - row[recent_session_columns.tip] = Glib::Markup::escape_text (dirname); + row[recent_session_columns.fullpath] = s; + row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname); row[recent_session_columns.time_modified] = gsb.st_mtime; if (Session::get_info_from_path (s, sr, sf) == 0) { row[recent_session_columns.sample_rate] = rate_as_string (sr); switch (sf) { case FormatFloat: - row[recent_session_columns.disk_format] = _("32 bit float"); + row[recent_session_columns.disk_format] = _("32-bit float"); break; case FormatInt24: - row[recent_session_columns.disk_format] = _("24 bit"); + row[recent_session_columns.disk_format] = _("24-bit"); break; case FormatInt16: - row[recent_session_columns.disk_format] = _("16 bit"); + row[recent_session_columns.disk_format] = _("16-bit"); break; } } else { @@ -734,10 +772,10 @@ SessionDialog::redisplay_recent_sessions () s = Glib::build_filename (dirname, *i2 + statefile_suffix); Gtk::TreeModel::Row child_row = *(recent_session_model->append (row.children())); - + child_row[recent_session_columns.visible_name] = *i2; child_row[recent_session_columns.fullpath] = s; - child_row[recent_session_columns.tip] = Glib::Markup::escape_text (dirname); + child_row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname); g_stat (s.c_str(), &gsb); child_row[recent_session_columns.time_modified] = gsb.st_mtime; @@ -747,18 +785,18 @@ SessionDialog::redisplay_recent_sessions () if (gsb.st_mtime > most_recent) { most_recent = gsb.st_mtime; } - + if (Session::get_info_from_path (s, sr, sf) == 0) { child_row[recent_session_columns.sample_rate] = rate_as_string (sr); switch (sf) { case FormatFloat: - child_row[recent_session_columns.disk_format] = _("32 bit float"); + child_row[recent_session_columns.disk_format] = _("32-bit float"); break; case FormatInt24: - child_row[recent_session_columns.disk_format] = _("24 bit"); + child_row[recent_session_columns.disk_format] = _("24-bit"); break; case FormatInt16: - child_row[recent_session_columns.disk_format] = _("16 bit"); + child_row[recent_session_columns.disk_format] = _("16-bit"); break; } } else { @@ -781,7 +819,7 @@ SessionDialog::redisplay_recent_sessions () row[recent_session_columns.time_formatted] = gdt.format ("%F %H:%M"); } - recent_session_display.set_tooltip_column(1); // recent_session_columns.tip + recent_session_display.set_tooltip_column(1); // recent_session_columns.tip recent_session_display.set_model (recent_session_model); // custom sort @@ -793,7 +831,7 @@ SessionDialog::redisplay_recent_sessions () pColumn->set_sort_column (recent_session_columns.time_modified); // unixtime } - int32_t sort = ARDOUR_UI::config()->get_recent_session_sort(); + int32_t sort = UIConfiguration::instance().get_recent_session_sort(); if (abs(sort) != 1 + recent_session_columns.visible_name.index () && abs(sort) != 1 + recent_session_columns.time_modified.index ()) { sort = 1 + recent_session_columns.visible_name.index(); @@ -810,8 +848,8 @@ SessionDialog::recent_session_sort_changed () SortType order; if (recent_session_model->get_sort_column_id (column, order)) { int32_t sort = (column + 1) * (order == Gtk::SORT_DESCENDING ? -1 : 1); - if (sort != ARDOUR_UI::config()->get_recent_session_sort()) { - ARDOUR_UI::config()->set_recent_session_sort(sort); + if (sort != UIConfiguration::instance().get_recent_session_sort()) { + UIConfiguration::instance().set_recent_session_sort(sort); } } } @@ -1128,6 +1166,12 @@ SessionDialog::recent_row_activated (const Gtk::TreePath&, Gtk::TreeViewColumn*) response (RESPONSE_ACCEPT); } +void +SessionDialog::disable_plugins_clicked () +{ + ARDOUR::Session::set_disable_all_loaded_plugins (_disable_plugins.get_active()); +} + void SessionDialog::existing_session_selected () {