X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_snapshots.cc;h=74fd114c6090a93f68a866cb490b5d4da2bd2ec8;hb=4dc65e66;hp=ed49ef35b3c3dca02bf4b4dc6cf4a05509437a65;hpb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;p=ardour.git diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index ed49ef35b3..74fd114c60 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -17,16 +17,30 @@ */ + +#include +#include +#include + #include -#include "gtkmm2ext/choice.h" + +#include "pbd/file_utils.h" +#include "pbd/gstdio_compat.h" + +#include "ardour/filename_extensions.h" +#include "ardour/profile.h" #include "ardour/session.h" #include "ardour/session_state_utils.h" #include "ardour/session_directory.h" + +#include "widgets/choice.h" +#include "widgets/prompter.h" + #include "editor_snapshots.h" #include "ardour_ui.h" -#include "i18n.h" #include "utils.h" -#include "prompter.h" + +#include "pbd/i18n.h" using namespace std; using namespace PBD; @@ -37,17 +51,35 @@ using namespace ARDOUR_UI_UTILS; EditorSnapshots::EditorSnapshots (Editor* e) : EditorComponent (e) { - _model = ListStore::create (_columns); - _display.set_model (_model); - _display.append_column (X_("snapshot"), _columns.visible_name); - _display.set_size_request (75, -1); - _display.set_headers_visible (false); - _display.set_reorderable (false); - _scroller.add (_display); - _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - - _display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSnapshots::selection_changed)); - _display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorSnapshots::button_press), false); + _snap_model = ListStore::create (_columns); + _snap_display.set_model (_snap_model); + _snap_display.append_column (_("Snapshot (click to load)"), _columns.visible_name); + _snap_display.append_column (_("Modified Date"), _columns.time_formatted); + _snap_display.set_size_request (75, -1); + _snap_display.set_headers_visible (true); + _snap_display.set_reorderable (false); + _snap_scroller.add (_snap_display); + _snap_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + + _snap_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSnapshots::selection_changed)); + _snap_display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorSnapshots::button_press), false); + + _back_model = ListStore::create (_columns); + _back_display.set_model (_back_model); + _back_display.append_column (_("Auto-Backup (click to load)"), _columns.visible_name); + _back_display.append_column (_("Modified Date"), _columns.time_formatted); + _back_display.set_size_request (75, -1); + _back_display.set_headers_visible (true); + _back_display.set_reorderable (false); + _back_scroller.add (_back_display); + _back_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + + _back_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSnapshots::backup_selection_changed)); + + _pane.add(_snap_scroller); +if(Profile->get_mixbus()) { + _pane.add(_back_scroller); +} } void @@ -63,9 +95,9 @@ EditorSnapshots::set_session (Session* s) void EditorSnapshots::selection_changed () { - if (_display.get_selection()->count_selected_rows() > 0) { + if (_snap_display.get_selection()->count_selected_rows() > 0) { - TreeModel::iterator i = _display.get_selection()->get_selected(); + TreeModel::iterator i = _snap_display.get_selection()->get_selected(); std::string snap_name = (*i)[_columns.real_name]; @@ -77,7 +109,9 @@ EditorSnapshots::selection_changed () return; } + _snap_display.set_sensitive (false); ARDOUR_UI::instance()->load_session (_session->path(), string (snap_name)); + _snap_display.set_sensitive (true); } } @@ -91,8 +125,8 @@ EditorSnapshots::button_press (GdkEventButton* ev) Gtk::TreeViewColumn* col; int cx; int cy; - _display.get_path_at_pos ((int) ev->x, (int) ev->y, path, col, cx, cy); - Gtk::TreeModel::iterator iter = _model->get_iter (path); + _snap_display.get_path_at_pos ((int) ev->x, (int) ev->y, path, col, cx, cy); + Gtk::TreeModel::iterator iter = _snap_model->get_iter (path); if (iter) { Gtk::TreeModel::Row row = *iter; popup_context_menu (ev->button, ev->time, row[_columns.real_name]); @@ -129,7 +163,7 @@ EditorSnapshots::popup_context_menu (int button, int32_t time, std::string snaps void EditorSnapshots::rename (std::string old_name) { - ArdourPrompter prompter(true); + ArdourWidgets::Prompter prompter(true); string new_name; @@ -159,7 +193,7 @@ EditorSnapshots::remove (std::string name) choices.push_back (_("No, do nothing.")); choices.push_back (_("Yes, remove it.")); - Gtkmm2ext::Choice prompter (_("Remove snapshot"), prompt, choices); + ArdourWidgets::Choice prompter (_("Remove snapshot"), prompt, choices); if (prompter.run () == 1) { _session->remove_state (name); @@ -174,37 +208,110 @@ EditorSnapshots::redisplay () return; } - vector state_file_paths; + //fill the snapshots pane + { + vector state_file_paths; - get_state_files_in_directory (_session->session_directory().root_path(), - state_file_paths); + get_state_files_in_directory (_session->session_directory().root_path(), + state_file_paths); - if (state_file_paths.empty()) { - return; - } + if (state_file_paths.empty()) { + return; + } + + vector state_file_names (get_file_names_no_extension(state_file_paths)); + + _snap_model->clear (); + + for (vector::iterator i = state_file_names.begin(); i != state_file_names.end(); ++i) + { + string statename = (*i); + TreeModel::Row row = *(_snap_model->append()); + + /* this lingers on in case we ever want to change the visible + name of the snapshot. + */ + + string display_name; + display_name = statename; + + if (statename == _session->snap_name()) { + _snap_display.get_selection()->select(row); + } - vector state_file_names (get_file_names_no_extension(state_file_paths)); + std::string s = Glib::build_filename (_session->path(), statename + ARDOUR::statefile_suffix); - _model->clear (); + GStatBuf gsb; + g_stat (s.c_str(), &gsb); + Glib::DateTime gdt(Glib::DateTime::create_now_local (gsb.st_mtime)); - for (vector::iterator i = state_file_names.begin(); i != state_file_names.end(); ++i) + row[_columns.visible_name] = display_name; + row[_columns.real_name] = statename; + row[_columns.time_formatted] = gdt.format ("%F %H:%M"); + } + } + + //fill the backup pane { - string statename = (*i); - TreeModel::Row row = *(_model->append()); + vector state_file_paths; + + get_state_files_in_directory (_session->session_directory().backup_path(), + state_file_paths); + + if (state_file_paths.empty()) { + return; + } + + vector state_file_names (get_file_names_no_extension(state_file_paths)); + + _back_model->clear (); + + for (vector::iterator i = state_file_names.begin(); i != state_file_names.end(); ++i) + { + string statename = (*i); + TreeModel::Row row = *(_back_model->append()); + + /* this lingers on in case we ever want to change the visible + name of the snapshot. + */ - /* this lingers on in case we ever want to change the visible - name of the snapshot. - */ + string display_name; + display_name = statename; - string display_name; - display_name = statename; + std::string s = Glib::build_filename (_session->path(), statename + ARDOUR::statefile_suffix); - if (statename == _session->snap_name()) { - _display.get_selection()->select(row); + GStatBuf gsb; + g_stat (s.c_str(), &gsb); + Glib::DateTime gdt(Glib::DateTime::create_now_local (gsb.st_mtime)); + + row[_columns.visible_name] = display_name; + row[_columns.real_name] = statename; + row[_columns.time_formatted] = gdt.format ("%F %H:%M"); } + } + +} + +/** A new backup has been selected. + */ +void +EditorSnapshots::backup_selection_changed () +{ + if (_back_display.get_selection()->count_selected_rows() > 0) { + + TreeModel::iterator i = _back_display.get_selection()->get_selected(); + + std::string back_name = (*i)[_columns.real_name]; - row[_columns.visible_name] = display_name; - row[_columns.real_name] = statename; + //copy the backup file to the session root folder, so we can open it + std::string back_path = _session->session_directory().backup_path() + G_DIR_SEPARATOR + back_name + ARDOUR::statefile_suffix; + std::string copy_path = _session->session_directory().root_path() + G_DIR_SEPARATOR + back_name + ARDOUR::statefile_suffix; + PBD::copy_file (back_path, copy_path); + + //now open the copy + _snap_display.set_sensitive (false); + ARDOUR_UI::instance()->load_session (_session->path(), string (back_name)); + _snap_display.set_sensitive (true); } }