ardour/livetrax
13
0
Fork 0
Code

Add GUI support to extract and open session-archives

Browse Source
This commit is contained in:
Robin Gareus 2016-12-27 22:25:22 +01:00
parent bbbf8e6127
commit f76e8868ef
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk2_ardour/ardour_ui.cc
View File

@ -1878,6 +1878,13 @@ ARDOUR_UI::open_session ()
session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix)); session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME)); session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
open_session_selector.add_filter (session_filter); open_session_selector.add_filter (session_filter);
FileFilter archive_filter;
archive_filter.add_pattern (X_("*.tar.xz"));
archive_filter.set_name (_("Session Archives"));
open_session_selector.add_filter (archive_filter);
open_session_selector.set_filter (session_filter); open_session_selector.set_filter (session_filter);
int response = open_session_selector.run(); int response = open_session_selector.run();
@ -1892,7 +1899,18 @@ ARDOUR_UI::open_session ()
bool isnew; bool isnew;
if (session_path.length() > 0) { if (session_path.length() > 0) {
if (ARDOUR::find_session (session_path, path, name, isnew) == 0) { int rv = ARDOUR::inflate_session (session_path,
Config->get_default_session_parent_dir(), path, name);
if (rv == 0) {
_session_is_new = false;
load_session (path, name);
}
else if (rv < 0) {
MessageDialog msg (_main_window,
string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
msg.run ();
}
else if (ARDOUR::find_session (session_path, path, name, isnew) == 0) {
_session_is_new = isnew; _session_is_new = isnew;
load_session (path, name); load_session (path, name);
} }
@ -3305,6 +3323,21 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
likely_new = true; likely_new = true;
} }
if (!likely_new) {
int rv = ARDOUR::inflate_session (session_name,
Config->get_default_session_parent_dir(), session_path, session_name);
if (rv < 0) {
MessageDialog msg (session_dialog,
string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
msg.run ();
continue;
}
else if (rv == 0) {
session_dialog.set_provided_session (session_name, session_path);
}
}
// XXX check archive, inflate
string::size_type suffix = session_name.find (statefile_suffix); string::size_type suffix = session_name.find (statefile_suffix);
if (suffix != string::npos) { if (suffix != string::npos) {

6
gtk2_ardour/session_dialog.cc
View File

@ -412,6 +412,12 @@ SessionDialog::setup_initial_choice_box ()
session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix)); session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME)); session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
existing_session_chooser.add_filter (session_filter); existing_session_chooser.add_filter (session_filter);
FileFilter archive_filter;
archive_filter.add_pattern (X_("*.tar.xz"));
archive_filter.set_name (_("Session Archives"));
existing_session_chooser.add_filter (archive_filter);
existing_session_chooser.set_filter (session_filter); existing_session_chooser.set_filter (session_filter);
Gtkmm2ext::add_volume_shortcuts (existing_session_chooser); Gtkmm2ext::add_volume_shortcuts (existing_session_chooser);