X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstartup.cc;h=5a0c9c8430e613f4ca09fb45f4ca5c75b20589a6;hb=7b57d47e2592641181d0e87b51ee93e89b4068f2;hp=5dc6c2b75f03cf559dcbb816246c0999f9c9a8d0;hpb=88beef2e93d26d28467fe151f5ef2972d0ca9169;p=ardour.git diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 5dc6c2b75f..5a0c9c8430 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -1,3 +1,26 @@ +/* + Copyright (C) 2010 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#ifdef WAF_BUILD +#include "gtk2ardour-config.h" +#endif + #include #include @@ -6,19 +29,22 @@ #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" -#include "pbd/filesystem.h" #include "pbd/replace_all.h" +#include "pbd/whitespace.h" #include "ardour/filesystem_paths.h" #include "ardour/recent_sessions.h" #include "ardour/session.h" #include "ardour/session_state_utils.h" #include "ardour/template_utils.h" +#include "ardour/filename_extensions.h" +#include "ardour_ui.h" #include "startup.h" #include "opts.h" #include "engine_dialog.h" #include "i18n.h" +#include "utils.h" using namespace std; using namespace Gtk; @@ -35,90 +61,116 @@ static string poor_mans_glob (string path) replace_all (copy, "~", Glib::get_home_dir()); return copy; } - -ArdourStartup::ArdourStartup () - : applying (false) - , ic_new_session_button (_("Open a new session")) + +ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name) + : _response (RESPONSE_OK) + , config_modified (false) + , new_only (require_new) + , default_dir_chooser (0) + , ic_new_session_button (_("Create a new session")) , ic_existing_session_button (_("Open an existing session")) , monitor_via_hardware_button (_("Use an external mixer or the hardware mixer of your audio interface.\n\ Ardour will play NO role in monitoring")) - , monitor_via_ardour_button (_("Ask Ardour to playback material as it is being recorded")) + , monitor_via_ardour_button (string_compose (_("Ask %1 to play back material as it is being recorded"), PROGRAM_NAME)) + , engine_dialog (0) , new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER) , more_new_session_options_button (_("I'd like more options for this session")) , _output_limit_count_adj (1, 0, 100, 1, 10, 0) , _input_limit_count_adj (1, 0, 100, 1, 10, 0) - , _control_bus_channel_count_adj (2, 0, 100, 1, 10, 0) , _master_bus_channel_count_adj (2, 0, 100, 1, 10, 0) - + , audio_page_index (-1) + , new_user_page_index (-1) + , default_folder_page_index (-1) + , monitoring_page_index (-1) + , session_page_index (-1) + , initial_choice_index (-1) + , final_page_index (-1) + , session_options_page_index (-1) + , _existing_session_chooser_used (false) { - audio_page_index = -1; - initial_choice_index = -1; - new_user_page_index = -1; - default_folder_page_index = -1; - monitoring_page_index = -1; - session_page_index = -1; - final_page_index = -1; - session_options_page_index = -1; - new_only = false; - - engine_dialog = 0; - config_modified = false; - default_dir_chooser = 0; - - use_template_button.set_group (session_template_group); - use_session_as_template_button.set_group (session_template_group); - - set_keep_above (true); - set_resizable (false); - set_position (WIN_POS_CENTER); - set_border_width (12); - - sys::path icon_file; - - if (!find_file_in_search_path (ardour_search_path() + system_data_search_path().add_subdirectory_to_paths("icons"), "ardour_icon_48px.png", icon_file)) { - throw failed_constructor(); - } - - try { - icon_pixbuf = Gdk::Pixbuf::create_from_file (icon_file.to_string()); - } - - catch (...) { - throw failed_constructor(); - } - - sys::path been_here_before = user_config_directory(); - been_here_before /= ".a3"; // XXXX use more specific version so we can catch upgrades - new_user = !exists (been_here_before); + new_user = !Glib::file_test (been_here_before_path(), Glib::FILE_TEST_EXISTS); + need_audio_setup = EngineControl::need_setup (); + need_session_info = (session_name.empty() || require_new); - bool need_audio_setup = !EngineControl::engine_running(); - - if (new_user) { - /* "touch" the file */ - ofstream fout (been_here_before.to_string().c_str()); - setup_new_user_page (); - setup_first_time_config_page (); - setup_monitoring_choice_page (); + _provided_session_name = session_name; + _provided_session_path = session_path; + + if (need_audio_setup || need_session_info || new_user) { - if (need_audio_setup) { - setup_audio_page (); + use_template_button.set_group (session_template_group); + use_session_as_template_button.set_group (session_template_group); + + set_keep_above (true); + set_position (WIN_POS_CENTER); + set_border_width (12); + + if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) { + throw failed_constructor(); + } + + list > window_icons; + Glib::RefPtr icon; + + if ((icon = ::get_icon ("ardour_icon_16px")) != 0) { + window_icons.push_back (icon); + } + if ((icon = ::get_icon ("ardour_icon_22px")) != 0) { + window_icons.push_back (icon); + } + if ((icon = ::get_icon ("ardour_icon_32px")) != 0) { + window_icons.push_back (icon); + } + if ((icon = ::get_icon ("ardour_icon_48px")) != 0) { + window_icons.push_back (icon); + } + if (!window_icons.empty ()) { + set_default_icon_list (window_icons); } - } else { - - if (need_audio_setup) { - setup_audio_page (); + set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG); + + // setup_prerelease_page (); + + if (new_user) { + + setup_new_user_page (); + setup_first_time_config_page (); + setup_monitoring_choice_page (); + setup_monitor_section_choice_page (); + + if (need_audio_setup) { + setup_audio_page (); + } + + ic_new_session_button.set_active (true); // always create new session on first run + + } else { + + if (need_audio_setup) { + setup_audio_page (); + } + + setup_initial_choice_page (); } - setup_initial_choice_page (); - } + setup_session_page (); + setup_more_options_page (); + + if (new_user) { + setup_final_page (); + } - setup_session_page (); - setup_more_options_page (); + if (new_only) { + ic_vbox.hide (); + } else { + ic_vbox.show (); + } - if (new_user) { - setup_final_page (); + if (!template_name.empty()) { + use_template_button.set_active (false); + load_template_override = template_name; + } } the_startup = this; @@ -128,21 +180,54 @@ ArdourStartup::~ArdourStartup () { } +bool +ArdourStartup::ready_without_display () const +{ + return !new_user && !need_audio_setup && !need_session_info; +} + void -ArdourStartup::set_new_only (bool yn) +ArdourStartup::setup_prerelease_page () { - new_only = yn; + VBox* vbox = manage (new VBox); + Label* label = manage (new Label); + label->set_markup (_("Welcome to this BETA release of Ardour 3.0\n\n\ +There are still several issues and bugs to be worked on,\n\ +as well as general workflow improvements, before this can be considered\n\ +release software. So, a few guidelines:\n\ +\n\ +1) Please do NOT use this software with the expectation that it is stable or reliable\n\ + though it may be so, depending on your workflow.\n\ +2) Please see http://ardour.org/a3_features for a guide to new features.\n\ +3) Please do NOT use the forums at ardour.org to report issues.\n\ +4) Please DO use the bugtracker at http://tracker.ardour.org/ to report issues\n\ + making sure to note the product version number as 3.0-beta.\n\ +5) Please DO use the ardour-users mailing list to discuss ideas and pass on comments.\n\ +6) Please DO join us on IRC for real time discussions about ardour3. You\n\ + can get there directly from Ardour via the Help->Chat menu option.\n\ +\n\ +Full information on all the above can be found on the support page at\n\ +\n\ + http://ardour.org/support\n\ +")); - if (new_only) { - ic_vbox.hide (); - } else { - ic_vbox.show (); - } + vbox->set_border_width (12); + vbox->pack_start (*label, false, false, 12); + vbox->show_all (); + + append_page (*vbox); + set_page_type (*vbox, ASSISTANT_PAGE_CONTENT); + set_page_title (*vbox, _("This is a BETA RELEASE")); + set_page_complete (*vbox, true); } bool ArdourStartup::use_session_template () { + if (!load_template_override.empty()) { + return true; + } + if (use_template_button.get_active()) { return template_chooser.get_active_row_number() > 0; } else { @@ -150,11 +235,16 @@ ArdourStartup::use_session_template () } } -Glib::ustring +std::string ArdourStartup::session_template_name () { + if (!load_template_override.empty()) { + string the_path (ARDOUR::user_template_directory()); + return Glib::build_filename (the_path, load_template_override + ARDOUR::template_suffix); + } + if (ic_existing_session_button.get_active()) { - return ustring(); + return string(); } if (use_template_button.get_active()) { @@ -168,17 +258,28 @@ ArdourStartup::session_template_name () } } -Glib::ustring +std::string ArdourStartup::session_name (bool& should_be_new) { + if (ready_without_display()) { + return _provided_session_name; + } + if (ic_new_session_button.get_active()) { should_be_new = true; - return new_name_entry.get_text (); + string val = new_name_entry.get_text (); + strip_whitespace_edges (val); + return val; + } else if (_existing_session_chooser_used) { + /* existing session chosen from file chooser */ + should_be_new = false; + return existing_session_chooser.get_filename (); } else { + /* existing session chosen from recent list */ should_be_new = false; TreeIter iter = recent_session_display.get_selection()->get_selected(); - + if (iter) { return (*iter)[recent_session_columns.visible_name]; } @@ -187,18 +288,26 @@ ArdourStartup::session_name (bool& should_be_new) } } -Glib::ustring +std::string ArdourStartup::session_folder () { + if (ready_without_display()) { + return _provided_session_path; + } + if (ic_new_session_button.get_active()) { - Glib::ustring legal_session_folder_name = legalize_for_path (new_name_entry.get_text()); + std::string legal_session_folder_name = legalize_for_path (new_name_entry.get_text()); return Glib::build_filename (new_folder_chooser.get_current_folder(), legal_session_folder_name); + } else if (_existing_session_chooser_used) { + /* existing session chosen from file chooser */ + return existing_session_chooser.get_current_folder (); } else { + /* existing session chosen from recent list */ TreeIter iter = recent_session_display.get_selection()->get_selected(); if (iter) { return (*iter)[recent_session_columns.fullpath]; - } + } return ""; } } @@ -214,8 +323,8 @@ ArdourStartup::setup_audio_page () audio_page_index = append_page (*engine_dialog); set_page_type (*engine_dialog, ASSISTANT_PAGE_CONTENT); - set_page_title (*engine_dialog, _("Audio Setup")); - + set_page_title (*engine_dialog, _("Audio / MIDI Setup")); + /* the default parameters should work, so the page is potentially complete */ set_page_complete (*engine_dialog, true); @@ -226,16 +335,18 @@ ArdourStartup::setup_new_user_page () { Label* foomatic = manage (new Label); - foomatic->set_markup (_("\ -Ardour is a digital audio workstation. You can use it to\n\ -record, edit and mix multi-track audio. You can produce your\n\ -own CDs, mix video soundtracks, or just experiment with new\n\ -ideas about music and sound.\n\ -\n\ -There are a few things that need to configured before you start\n\ -using the program.\ -")); - + foomatic->set_markup (string_compose (_("\ +%1 is a digital audio workstation. You can use it to \ +record, edit and mix multi-track audio. You can produce your \ +own CDs, mix video soundtracks, or experiment with new \ +ideas about music and sound. \ +\n\n\ +There are a few things that need to be configured before you start \ +using the program. \ +"), PROGRAM_NAME)); + foomatic->set_justify (JUSTIFY_FILL); + foomatic->set_line_wrap (); + HBox* hbox = manage (new HBox); HBox* vbox = manage (new HBox); @@ -250,7 +361,7 @@ using the program.\ new_user_page_index = append_page (*vbox); set_page_type (*vbox, ASSISTANT_PAGE_INTRO); - set_page_title (*vbox, _("Welcome to Ardour")); + set_page_title (*vbox, string_compose (_("Welcome to %1"), PROGRAM_NAME)); set_page_header_image (*vbox, icon_pixbuf); set_page_complete (*vbox, true); } @@ -258,25 +369,33 @@ using the program.\ void ArdourStartup::default_dir_changed () { - Config->set_default_session_parent_dir (default_dir_chooser->get_current_folder()); + Config->set_default_session_parent_dir (default_dir_chooser->get_filename()); + // make new session folder chooser point to the new default + new_folder_chooser.set_current_folder (Config->get_default_session_parent_dir()); + config_changed (); +} + +void +ArdourStartup::config_changed () +{ config_modified = true; } void ArdourStartup::setup_first_time_config_page () { - default_dir_chooser = manage (new FileChooserButton (_("Default folder for Ardour sessions"), + default_dir_chooser = manage (new FileChooserButton (string_compose (_("Default folder for %1 sessions"), PROGRAM_NAME), FILE_CHOOSER_ACTION_SELECT_FOLDER)); Gtk::Label* txt = manage (new Label); HBox* hbox = manage (new HBox); VBox* vbox = manage (new VBox); - - txt->set_markup (_("\ -Each project that you work on with Ardour has its own folder.\n\ + + txt->set_markup (string_compose (_("\ +Each project that you work on with %1 has its own folder.\n\ These can require a lot of disk space if you are recording audio.\n\ \n\ -Where would you like new Ardour sessions to be stored by default?\n\n\ -(You can put new sessions anywhere, this is just a default)")); +Where would you like new %1 sessions to be stored by default?\n\n\ +(You can put new sessions anywhere, this is just a default)"), PROGRAM_NAME)); txt->set_alignment (0.0, 0.0); vbox->set_spacing (18); @@ -287,7 +406,7 @@ Where would you like new Ardour sessions to be stored by default?\n\n\ vbox->pack_start (*hbox, false, true); default_dir_chooser->set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir())); - default_dir_chooser->signal_current_folder_changed().connect (mem_fun (*this, &ArdourStartup::default_dir_changed)); + default_dir_chooser->signal_current_folder_changed().connect (sigc::mem_fun (*this, &ArdourStartup::default_dir_changed)); default_dir_chooser->show (); vbox->show_all (); @@ -307,19 +426,20 @@ ArdourStartup::setup_monitoring_choice_page () { mon_vbox.set_spacing (18); mon_vbox.set_border_width (24); - + HBox* hbox = manage (new HBox); VBox* vbox = manage (new VBox); RadioButton::Group g (monitor_via_hardware_button.get_group()); monitor_via_ardour_button.set_group (g); - monitor_label.set_markup("\ + monitor_label.set_markup(_("\ While recording instruments or vocals, you probably want to listen to the\n\ signal as well as record it. This is called \"monitoring\". There are\n\ different ways to do this depending on the equipment you have and the\n\ configuration of that equipment. The two most common are presented here.\n\ Please choose whichever one is right for your setup.\n\n\ -(You can change this preference at any time, via the Options menu)"); +(You can change this preference at any time, via the Preferences dialog)\n\n\ +If you do not understand what this is about, just accept the default.")); monitor_label.set_alignment (0.0, 0.0); vbox->set_spacing (6); @@ -343,6 +463,76 @@ Please choose whichever one is right for your setup.\n\n\ set_page_complete (mon_vbox, true); } +void +ArdourStartup::setup_monitor_section_choice_page () +{ + mon_sec_vbox.set_spacing (18); + mon_sec_vbox.set_border_width (24); + + HBox* hbox = manage (new HBox); + VBox* main_vbox = manage (new VBox); + VBox* vbox; + Label* l = manage (new Label); + + main_vbox->set_spacing (32); + + no_monitor_section_button.set_label (_("Use a Master bus directly")); + l->set_alignment (0.0, 1.0); + l->set_markup(_("Connect the Master bus directly to your hardware outputs. This is preferable for simple usage.")); + + vbox = manage (new VBox); + vbox->set_spacing (6); + vbox->pack_start (no_monitor_section_button, false, true); + vbox->pack_start (*l, false, true); + + main_vbox->pack_start (*vbox, false, false); + + use_monitor_section_button.set_label (_("Use an additional Monitor bus")); + l = manage (new Label); + l->set_alignment (0.0, 1.0); + l->set_text (_("Use a Monitor bus between Master bus and hardware outputs for \n\ +greater control in monitoring without affecting the mix.")); + + vbox = manage (new VBox); + vbox->set_spacing (6); + vbox->pack_start (use_monitor_section_button, false, true); + vbox->pack_start (*l, false, true); + + main_vbox->pack_start (*vbox, false, false); + + RadioButton::Group g (use_monitor_section_button.get_group()); + no_monitor_section_button.set_group (g); + + if (Config->get_use_monitor_bus()) { + use_monitor_section_button.set_active (true); + } else { + no_monitor_section_button.set_active (true); + } + + use_monitor_section_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed)); + no_monitor_section_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed)); + + monitor_section_label.set_markup(_("You can change this preference at any time via the Preferences dialog.\nYou can also add or remove the monitor section to/from any session.\n\n\ +If you do not understand what this is about, just accept the default.")); + monitor_section_label.set_alignment (0.0, 0.0); + + hbox->pack_start (*main_vbox, true, true, 8); + mon_sec_vbox.pack_start (*hbox, false, false); + mon_sec_vbox.pack_start (monitor_section_label, false, false); + + mon_sec_vbox.show_all (); + + monitor_section_page_index = append_page (mon_sec_vbox); + set_page_title (mon_sec_vbox, _("Monitor Section")); + set_page_header_image (mon_sec_vbox, icon_pixbuf); + + /* user could just click on "Forward" if default + * choice is correct. + */ + + set_page_complete (mon_sec_vbox, true); +} + void ArdourStartup::setup_initial_choice_page () { @@ -354,12 +544,18 @@ ArdourStartup::setup_initial_choice_page () HBox* centering_hbox = manage (new HBox); VBox* centering_vbox = manage (new VBox); - + centering_vbox->set_spacing (6); centering_vbox->pack_start (ic_new_session_button, false, true); centering_vbox->pack_start (ic_existing_session_button, false, true); + ic_new_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked), false); + ic_new_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false); + + ic_existing_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked), false); + ic_existing_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false); + centering_hbox->pack_start (*centering_vbox, true, true); ic_vbox.pack_start (*centering_hbox, true, true); @@ -377,6 +573,24 @@ ArdourStartup::setup_initial_choice_page () set_page_complete (ic_vbox, true); } +bool +ArdourStartup::initial_button_clicked (GdkEventButton* ev) +{ + if (ev->type == GDK_2BUTTON_PRESS && session_page_index != -1) { + set_current_page(session_page_index); + } + + return false; +} + +void +ArdourStartup::initial_button_activated () +{ + if (session_page_index != -1) { + set_current_page(session_page_index); + } +} + void ArdourStartup::setup_session_page () { @@ -393,7 +607,7 @@ ArdourStartup::setup_session_page () void ArdourStartup::setup_final_page () { - final_page.set_text ("Ardour is ready for use"); + final_page.set_text (string_compose (_("%1 is ready for use"), PROGRAM_NAME)); final_page.show (); final_page_index = append_page (final_page); set_page_complete (final_page, true); @@ -404,43 +618,49 @@ ArdourStartup::setup_final_page () void ArdourStartup::on_cancel () { - exit (1); + _response = RESPONSE_CANCEL; + gtk_main_quit (); } -void -ArdourStartup::on_close () +bool +ArdourStartup::on_delete_event (GdkEventAny*) { - if (!applying) { - exit (1); - } + _response = RESPONSE_CLOSE; + gtk_main_quit (); + return true; } void ArdourStartup::on_apply () { - applying = true; - - // XXX do stuff and then .... - if (engine_dialog) { - engine_dialog->setup_engine (); + if (engine_dialog->setup_engine ()) { + set_current_page (audio_page_index); + return; + } } if (config_modified) { if (default_dir_chooser) { - Config->set_default_session_parent_dir (default_dir_chooser->get_current_folder()); + Config->set_default_session_parent_dir (default_dir_chooser->get_filename()); } - + if (monitor_via_hardware_button.get_active()) { Config->set_monitoring_model (ExternalMonitoring); } else if (monitor_via_ardour_button.get_active()) { Config->set_monitoring_model (SoftwareMonitoring); } + + Config->set_use_monitor_bus (use_monitor_section_button.get_active()); + + /* "touch" the been-here-before path now that we're about to save Config */ + ofstream fout (been_here_before_path().c_str()); Config->save_state (); } + _response = RESPONSE_OK; gtk_main_quit (); } @@ -448,22 +668,42 @@ void ArdourStartup::on_prepare (Gtk::Widget* page) { if (page == &session_vbox) { - + if (ic_new_session_button.get_active()) { /* new session requested */ setup_new_session_page (); } else { /* existing session requested */ setup_existing_session_page (); + } - } + + /* HACK HACK HACK ... change the "Apply" button label + to say "Open" + */ + + Gtk::Widget* tl = session_vbox.get_toplevel(); + Gtk::Window* win; + if ((win = dynamic_cast(tl)) != 0) { + /* ::get_default_widget() is not wrapped in gtkmm */ + Gtk::Widget* def = wrap (gtk_window_get_default_widget (win->gobj())); + Gtk::Button* button; + if ((button = dynamic_cast(def)) != 0) { + if (more_new_session_options_button.get_active()) { + button->set_label (_("Forward")); + }else{ + button->set_label (_("Open")); + } + } + } + } } void ArdourStartup::populate_session_templates () { vector templates; - + find_session_templates (templates); template_model->clear (); @@ -472,12 +712,19 @@ ArdourStartup::populate_session_templates () TreeModel::Row row; row = *(template_model->append ()); - + row[session_template_columns.name] = (*x).name; row[session_template_columns.path] = (*x).path; } } +static bool +lost_name_entry_focus (GdkEventFocus*) +{ + // cerr << "lost focus\n"; + return false; +} + void ArdourStartup::setup_new_session_page () { @@ -491,45 +738,56 @@ ArdourStartup::setup_new_session_page () VBox *vbox1 = manage (new VBox); HBox* hbox1 = manage (new HBox); Label* label1 = manage (new Label); - + vbox1->set_spacing (6); hbox1->set_spacing (6); hbox1->pack_start (*label1, false, false); hbox1->pack_start (new_name_entry, true, true); - + label1->set_text (_("Session name:")); - + if (!ARDOUR_COMMAND_LINE::session_name.empty()) { new_name_entry.set_text (Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name)); /* name provided - they can move right along */ set_page_complete (session_vbox, true); } - - new_name_entry.signal_changed().connect (mem_fun (*this, &ArdourStartup::new_name_changed)); - new_name_entry.signal_activate().connect (mem_fun (*this, &ArdourStartup::move_along_now)); - + + new_name_entry.signal_changed().connect (sigc::mem_fun (*this, &ArdourStartup::new_name_changed)); + new_name_entry.signal_activate().connect (sigc::mem_fun (*this, &ArdourStartup::move_along_now)); + vbox1->pack_start (*hbox1, true, true); /* --- */ HBox* hbox2 = manage (new HBox); Label* label2 = manage (new Label); - + hbox2->set_spacing (6); hbox2->pack_start (*label2, false, false); hbox2->pack_start (new_folder_chooser, true, true); - + label2->set_text (_("Create session folder in:")); - + if (!ARDOUR_COMMAND_LINE::session_name.empty()) { new_folder_chooser.set_current_folder (poor_mans_glob (Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name))); + } else if (ARDOUR_UI::instance()->session_loaded) { + // point the new session file chooser at the parent directory of the current session + string session_parent_dir = Glib::path_get_dirname(ARDOUR_UI::instance()->the_session()->path()); + string::size_type last_dir_sep = session_parent_dir.rfind(G_DIR_SEPARATOR); + session_parent_dir = session_parent_dir.substr(0, last_dir_sep); + new_folder_chooser.set_current_folder (session_parent_dir); + new_folder_chooser.add_shortcut_folder (poor_mans_glob (Config->get_default_session_parent_dir())); } else { new_folder_chooser.set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir())); } new_folder_chooser.set_title (_("Select folder for session")); +#ifdef GTKOSX + new_folder_chooser.add_shortcut_folder ("/Volumes"); +#endif + vbox1->pack_start (*hbox2, false, false); session_new_vbox.pack_start (*vbox1, false, false); @@ -543,7 +801,7 @@ ArdourStartup::setup_new_session_page () populate_session_templates (); vbox2->set_spacing (6); - + label3->set_markup (_("Options")); label3->set_alignment (0.0, 0.0); @@ -565,54 +823,54 @@ ArdourStartup::setup_new_session_page () 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); - + use_template_button.show(); template_chooser.show (); vbox3->pack_start (*hbox4a, false, false); } - + /* --- */ if (!new_user) { session_template_chooser.set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir())); - + HBox* hbox4b = manage (new HBox); use_session_as_template_button.set_label (_("Use an existing session as a template:")); - + hbox4b->set_spacing (6); hbox4b->pack_start (use_session_as_template_button, false, false); hbox4b->pack_start (session_template_chooser, true, true); - + use_session_as_template_button.show (); session_template_chooser.show (); - - Gtk::FileFilter* template_filter = manage (new (Gtk::FileFilter)); - template_filter->add_pattern(X_("*.template")); - session_template_chooser.set_filter (*template_filter); + + Gtk::FileFilter* session_filter = manage (new (Gtk::FileFilter)); + session_filter->add_pattern (X_("*.ardour")); + session_template_chooser.set_filter (*session_filter); session_template_chooser.set_title (_("Select template")); vbox3->pack_start (*hbox4b, false, false); } /* --- */ - + HBox* hbox5 = manage (new HBox); - + hbox5->set_spacing (6); hbox5->pack_start (more_new_session_options_button, false, false); - + more_new_session_options_button.show (); - more_new_session_options_button.signal_clicked().connect (mem_fun (*this, &ArdourStartup::more_new_session_options_button_clicked)); + more_new_session_options_button.signal_clicked().connect (sigc::mem_fun (*this, &ArdourStartup::more_new_session_options_button_clicked)); vbox3->pack_start (*hbox5, false, false); hbox3->pack_start (*vbox3, true, true, 8); @@ -628,6 +886,18 @@ ArdourStartup::setup_new_session_page () set_page_title (session_vbox, _("New Session")); set_page_type (session_vbox, ASSISTANT_PAGE_CONFIRM); + if (more_new_session_options_button.get_active()) { + set_page_type (session_vbox, ASSISTANT_PAGE_CONTENT); + } + + new_name_entry.signal_map().connect (sigc::mem_fun (*this, &ArdourStartup::new_name_mapped)); + new_name_entry.signal_focus_out_event().connect (sigc::ptr_fun (lost_name_entry_focus)); +} + +void +ArdourStartup::new_name_mapped () +{ + // cerr << "Grab new name focus\n"; new_name_entry.grab_focus (); } @@ -641,12 +911,12 @@ ArdourStartup::new_name_changed () } } -void +int ArdourStartup::redisplay_recent_sessions () { - std::vector session_directories; + std::vector session_directories; RecentSessionsSorter cmp; - + recent_session_display.set_model (Glib::RefPtr(0)); recent_session_model->clear (); @@ -655,19 +925,21 @@ ArdourStartup::redisplay_recent_sessions () if (rs.empty()) { recent_session_display.set_model (recent_session_model); - return; + return 0; } // // sort them alphabetically sort (rs.begin(), rs.end(), cmp); - + for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) { - session_directories.push_back ((*i).second); + session_directories.push_back ((*i).second); } - for (vector::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) + int session_snapshot_count = 0; + + for (vector::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) { - std::vector state_file_paths; + std::vector state_file_paths; // now get available states for this session @@ -675,8 +947,8 @@ ArdourStartup::redisplay_recent_sessions () vector* states; vector item; - string fullpath = (*i).to_string(); - + string fullpath = *i; + /* remove any trailing / */ if (fullpath[fullpath.length()-1] == '/') { @@ -687,15 +959,15 @@ ArdourStartup::redisplay_recent_sessions () if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) { /* session doesn't exist */ continue; - } - + } + /* now get available states for this session */ if ((states = Session::possible_states (fullpath)) == 0) { /* no state file? */ continue; } - + std::vector state_file_names(get_file_names_no_extension (state_file_paths)); Gtk::TreeModel::Row row = *(recent_session_model->append()); @@ -703,6 +975,8 @@ ArdourStartup::redisplay_recent_sessions () row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath); row[recent_session_columns.fullpath] = fullpath; + ++session_snapshot_count; + if (state_file_names.size() > 1) { // add the children @@ -715,11 +989,15 @@ ArdourStartup::redisplay_recent_sessions () child_row[recent_session_columns.visible_name] = *i2; child_row[recent_session_columns.fullpath] = fullpath; + ++session_snapshot_count; } } } + recent_session_display.set_tooltip_column(1); // recent_session_columns.fullpath recent_session_display.set_model (recent_session_model); + return session_snapshot_count; + // return rs.size(); } void @@ -735,32 +1013,64 @@ ArdourStartup::recent_session_row_selected () void ArdourStartup::setup_existing_session_page () { + recent_session_model = TreeStore::create (recent_session_columns); + redisplay_recent_sessions (); + if (!session_hbox.get_children().empty()) { session_hbox.remove (**session_hbox.get_children().begin()); } - if (recent_scroller.get_children().empty()) { + if (session_existing_vbox.get_children().empty()) { - recent_session_model = TreeStore::create (recent_session_columns); 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_BROWSE); - - recent_session_display.get_selection()->signal_changed().connect (mem_fun (*this, &ArdourStartup::recent_session_row_selected)); - + + recent_session_display.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &ArdourStartup::recent_session_row_selected)); + recent_scroller.add (recent_session_display); recent_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); recent_scroller.set_shadow_type (Gtk::SHADOW_IN); - + recent_session_display.show(); + + recent_scroller.show(); + int cnt = redisplay_recent_sessions (); + recent_session_display.signal_row_activated().connect (sigc::mem_fun (*this, &ArdourStartup::recent_row_activated)); + + if (cnt > 4) { + recent_scroller.set_size_request (-1, 300); + } + + session_existing_vbox.set_spacing (8); + session_existing_vbox.pack_start (recent_scroller, true, true); + + existing_session_chooser.set_title (_("Select session file")); + existing_session_chooser.signal_file_set().connect (sigc::mem_fun (*this, &ArdourStartup::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 ("*.ardour"); + 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 + + HBox* hbox = manage (new HBox); + hbox->set_spacing (4); + hbox->pack_start (*manage (new Label (_("Browse:"))), PACK_SHRINK); + hbox->pack_start (existing_session_chooser); + session_existing_vbox.pack_start (*hbox, false, false); + hbox->show_all (); } - recent_scroller.show(); - redisplay_recent_sessions (); - recent_session_display.signal_row_activated().connect (mem_fun (*this, &ArdourStartup::recent_row_activated)); + session_existing_vbox.show_all (); + session_hbox.pack_start (session_existing_vbox, true, true); - session_hbox.pack_start (recent_scroller, true, true); set_page_title (session_vbox, _("Select a session")); set_page_type (session_vbox, ASSISTANT_PAGE_CONFIRM); } @@ -785,11 +1095,9 @@ ArdourStartup::setup_more_options_page () _output_limit_count.set_adjustment (_output_limit_count_adj); _input_limit_count.set_adjustment (_input_limit_count_adj); - _control_bus_channel_count.set_adjustment (_control_bus_channel_count_adj); _master_bus_channel_count.set_adjustment (_master_bus_channel_count_adj); - + chan_count_label_1.set_text (_("channels")); - chan_count_label_2.set_text (_("channels")); chan_count_label_3.set_text (_("channels")); chan_count_label_4.set_text (_("channels")); @@ -797,10 +1105,6 @@ ArdourStartup::setup_more_options_page () chan_count_label_1.set_padding(0,0); chan_count_label_1.set_line_wrap(false); - chan_count_label_2.set_alignment(0,0.5); - chan_count_label_2.set_padding(0,0); - chan_count_label_2.set_line_wrap(false); - chan_count_label_3.set_alignment(0,0.5); chan_count_label_3.set_padding(0,0); chan_count_label_3.set_line_wrap(false); @@ -813,20 +1117,6 @@ ArdourStartup::setup_more_options_page () input_label.set_markup (_("Inputs")); output_label.set_markup (_("Outputs")); - _create_control_bus.set_label (_("Create monitor bus")); - _create_control_bus.set_flags(Gtk::CAN_FOCUS); - _create_control_bus.set_relief(Gtk::RELIEF_NORMAL); - _create_control_bus.set_mode(true); - _create_control_bus.set_active(false); - _create_control_bus.set_border_width(0); - - _control_bus_channel_count.set_flags(Gtk::CAN_FOCUS); - _control_bus_channel_count.set_update_policy(Gtk::UPDATE_ALWAYS); - _control_bus_channel_count.set_numeric(true); - _control_bus_channel_count.set_digits(0); - _control_bus_channel_count.set_wrap(false); - _control_bus_channel_count.set_sensitive(false); - _master_bus_channel_count.set_flags(Gtk::CAN_FOCUS); _master_bus_channel_count.set_update_policy(Gtk::UPDATE_ALWAYS); _master_bus_channel_count.set_numeric(true); @@ -842,14 +1132,14 @@ ArdourStartup::setup_more_options_page () advanced_table.set_row_spacings(0); advanced_table.set_col_spacings(0); - - _connect_inputs.set_label (_("Automatically connect to physical_inputs")); + + _connect_inputs.set_label (_("Automatically connect to physical inputs")); _connect_inputs.set_flags(Gtk::CAN_FOCUS); _connect_inputs.set_relief(Gtk::RELIEF_NORMAL); _connect_inputs.set_mode(true); - _connect_inputs.set_active(true); + _connect_inputs.set_active(Config->get_input_auto_connect() != ManualConnect); _connect_inputs.set_border_width(0); - + _limit_input_ports.set_label (_("Use only")); _limit_input_ports.set_flags(Gtk::CAN_FOCUS); _limit_input_ports.set_relief(Gtk::RELIEF_NORMAL); @@ -875,15 +1165,12 @@ ArdourStartup::setup_more_options_page () bus_frame.set_label_align(0,0.5); bus_frame.add(bus_hbox); bus_frame.set_label_widget(bus_label); - + bus_table.set_row_spacings (0); bus_table.set_col_spacings (0); bus_table.attach (_create_master_bus, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); bus_table.attach (_master_bus_channel_count, 1, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); bus_table.attach (chan_count_label_1, 2, 3, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 0); - bus_table.attach (_create_control_bus, 0, 1, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - bus_table.attach (_control_bus_channel_count, 1, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0); - bus_table.attach (chan_count_label_2, 2, 3, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 6, 0); input_port_limit_hbox.pack_start(_limit_input_ports, Gtk::PACK_SHRINK, 6); input_port_limit_hbox.pack_start(_input_limit_count, Gtk::PACK_SHRINK, 0); @@ -910,7 +1197,7 @@ ArdourStartup::setup_more_options_page () _connect_outputs.set_flags(Gtk::CAN_FOCUS); _connect_outputs.set_relief(Gtk::RELIEF_NORMAL); _connect_outputs.set_mode(true); - _connect_outputs.set_active(true); + _connect_outputs.set_active(Config->get_output_auto_connect() != ManualConnect); _connect_outputs.set_border_width(0); _limit_output_ports.set_label (_("Use only")); _limit_output_ports.set_flags(Gtk::CAN_FOCUS); @@ -932,7 +1219,7 @@ ArdourStartup::setup_more_options_page () _connect_outputs_to_master.set_flags(Gtk::CAN_FOCUS); _connect_outputs_to_master.set_relief(Gtk::RELIEF_NORMAL); _connect_outputs_to_master.set_mode(true); - _connect_outputs_to_master.set_active(false); + _connect_outputs_to_master.set_active(Config->get_output_auto_connect() == AutoConnectMaster); _connect_outputs_to_master.set_border_width(0); _connect_outputs_to_master.set_group (connect_outputs_group); @@ -942,7 +1229,7 @@ ArdourStartup::setup_more_options_page () _connect_outputs_to_physical.set_flags(Gtk::CAN_FOCUS); _connect_outputs_to_physical.set_relief(Gtk::RELIEF_NORMAL); _connect_outputs_to_physical.set_mode(true); - _connect_outputs_to_physical.set_active(false); + _connect_outputs_to_physical.set_active(Config->get_output_auto_connect() == AutoConnectPhysical); _connect_outputs_to_physical.set_border_width(0); output_conn_vbox.pack_start(_connect_outputs, Gtk::PACK_SHRINK, 0); @@ -975,18 +1262,18 @@ ArdourStartup::setup_more_options_page () /* signals */ - _connect_inputs.signal_clicked().connect (mem_fun (*this, &ArdourStartup::connect_inputs_clicked)); - _connect_outputs.signal_clicked().connect (mem_fun (*this, &ArdourStartup::connect_outputs_clicked)); - _limit_input_ports.signal_clicked().connect (mem_fun (*this, &ArdourStartup::limit_inputs_clicked)); - _limit_output_ports.signal_clicked().connect (mem_fun (*this, &ArdourStartup::limit_outputs_clicked)); - _create_master_bus.signal_clicked().connect (mem_fun (*this, &ArdourStartup::master_bus_button_clicked)); - _create_control_bus.signal_clicked().connect (mem_fun (*this, &ArdourStartup::monitor_bus_button_clicked)); + _connect_inputs.signal_clicked().connect (sigc::mem_fun (*this, &ArdourStartup::connect_inputs_clicked)); + _connect_outputs.signal_clicked().connect (sigc::mem_fun (*this, &ArdourStartup::connect_outputs_clicked)); + _limit_input_ports.signal_clicked().connect (sigc::mem_fun (*this, &ArdourStartup::limit_inputs_clicked)); + _limit_output_ports.signal_clicked().connect (sigc::mem_fun (*this, &ArdourStartup::limit_outputs_clicked)); + _create_master_bus.signal_clicked().connect (sigc::mem_fun (*this, &ArdourStartup::master_bus_button_clicked)); - /* note that more_options_vbox is NOT visible by - * default. this is entirely by design - this page - * should be skipped unless explicitly requested. + /* note that more_options_vbox is "visible" by default even + * though it may not be displayed to the user, this is so the dialog + * doesn't resize. */ - + more_options_vbox.show_all (); + session_options_page_index = append_page (more_options_vbox); set_page_title (more_options_vbox, _("Advanced Session Options")); set_page_complete (more_options_vbox, true); @@ -1004,18 +1291,6 @@ ArdourStartup::master_channel_count() const return _master_bus_channel_count.get_value_as_int(); } -bool -ArdourStartup::create_control_bus() const -{ - return _create_control_bus.get_active(); -} - -int -ArdourStartup::control_channel_count() const -{ - return _control_bus_channel_count.get_value_as_int(); -} - bool ArdourStartup::connect_inputs() const { @@ -1079,9 +1354,12 @@ ArdourStartup::connect_inputs_clicked () void ArdourStartup::connect_outputs_clicked () { - _limit_output_ports.set_sensitive(_connect_outputs.get_active()); + bool const co = _connect_outputs.get_active (); + _limit_output_ports.set_sensitive(co); + _connect_outputs_to_master.set_sensitive(co); + _connect_outputs_to_physical.set_sensitive(co); - if (_connect_outputs.get_active() && _limit_output_ports.get_active()) { + if (co && _limit_output_ports.get_active()) { _output_limit_count.set_sensitive(true); } else { _output_limit_count.set_sensitive(false); @@ -1103,13 +1381,10 @@ ArdourStartup::limit_outputs_clicked () void ArdourStartup::master_bus_button_clicked () { - _master_bus_channel_count.set_sensitive(_create_master_bus.get_active()); -} + bool const yn = _create_master_bus.get_active(); -void -ArdourStartup::monitor_bus_button_clicked () -{ - _control_bus_channel_count.set_sensitive(_create_control_bus.get_active()); + _master_bus_channel_count.set_sensitive(yn); + _connect_outputs_to_master.set_sensitive(yn); } void @@ -1127,8 +1402,24 @@ ArdourStartup::move_along_now () } void -ArdourStartup::recent_row_activated (const Gtk::TreePath& path, Gtk::TreeViewColumn* col) +ArdourStartup::recent_row_activated (const Gtk::TreePath&, Gtk::TreeViewColumn*) +{ + set_page_complete (session_vbox, true); + move_along_now (); +} + +void +ArdourStartup::existing_session_selected () { + _existing_session_chooser_used = true; + set_page_complete (session_vbox, true); move_along_now (); } + +std::string +ArdourStartup::been_here_before_path () const +{ + // XXXX use more specific version so we can catch upgrades + return Glib::build_filename (user_config_directory (), ".a3"); +}