Remove unused "auto-backup" pane
This reverts/reworks commit e87012ca89 -- a failed experiment
which isn't used by Mixbus either since it introduced various issues.
When reverting to backups > 1 hour old, closing the session first
is acceptable.
This commit is contained in:
parent
c218b65d24
commit
ce4b79e057
GPG Key ID:
A090BCE02CF57F04
|
|
@ -19,16 +19,14 @@
|
|||
|
||||
|
||||
#include <glib.h>
|
||||
#include "pbd/gstdio_compat.h"
|
||||
|
||||
#include <glibmm.h>
|
||||
#include <glibmm/datetime.h>
|
||||
|
||||
#include <gtkmm/liststore.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"
|
||||
|
|
@ -51,35 +49,18 @@ using namespace ARDOUR_UI_UTILS;
|
|||
EditorSnapshots::EditorSnapshots (Editor* e)
|
||||
: EditorComponent (e)
|
||||
{
|
||||
_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);
|
||||
_snapshot_model = ListStore::create (_columns);
|
||||
_snapshot_display.set_model (_snapshot_model);
|
||||
_snapshot_display.append_column (_("Snapshot (click to load)"), _columns.visible_name);
|
||||
_snapshot_display.append_column (_("Modified Date"), _columns.time_formatted);
|
||||
_snapshot_display.set_size_request (75, -1);
|
||||
_snapshot_display.set_headers_visible (true);
|
||||
_snapshot_display.set_reorderable (false);
|
||||
_scroller.add (_snapshot_display);
|
||||
_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);
|
||||
}
|
||||
_snapshot_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &EditorSnapshots::selection_changed));
|
||||
_snapshot_display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorSnapshots::button_press), false);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -90,50 +71,50 @@ EditorSnapshots::set_session (Session* s)
|
|||
redisplay ();
|
||||
}
|
||||
|
||||
/** A new snapshot has been selected.
|
||||
*/
|
||||
/* A new snapshot has been selected. */
|
||||
void
|
||||
EditorSnapshots::selection_changed ()
|
||||
{
|
||||
if (_snap_display.get_selection()->count_selected_rows() > 0) {
|
||||
|
||||
TreeModel::iterator i = _snap_display.get_selection()->get_selected();
|
||||
|
||||
std::string snap_name = (*i)[_columns.real_name];
|
||||
|
||||
if (snap_name.length() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_session->snap_name() == snap_name) {
|
||||
return;
|
||||
}
|
||||
|
||||
_snap_display.set_sensitive (false);
|
||||
ARDOUR_UI::instance()->load_session (_session->path(), string (snap_name));
|
||||
_snap_display.set_sensitive (true);
|
||||
if (_snapshot_display.get_selection()->count_selected_rows() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
TreeModel::iterator i = _snapshot_display.get_selection()->get_selected();
|
||||
|
||||
std::string snap_name = (*i)[_columns.real_name];
|
||||
|
||||
if (snap_name.length() == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_session->snap_name() == snap_name) {
|
||||
return;
|
||||
}
|
||||
|
||||
_snapshot_display.set_sensitive (false);
|
||||
ARDOUR_UI::instance()->load_session (_session->path(), string (snap_name));
|
||||
_snapshot_display.set_sensitive (true);
|
||||
}
|
||||
|
||||
bool
|
||||
EditorSnapshots::button_press (GdkEventButton* ev)
|
||||
{
|
||||
if (ev->button == 3) {
|
||||
/* Right-click on the snapshot list. Work out which snapshot it
|
||||
was over. */
|
||||
/* Right-click on the snapshot list.
|
||||
* Work out which snapshot it was over.
|
||||
*/
|
||||
Gtk::TreeModel::Path path;
|
||||
Gtk::TreeViewColumn* col;
|
||||
int cx;
|
||||
int cy;
|
||||
_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);
|
||||
_snapshot_display.get_path_at_pos ((int) ev->x, (int) ev->y, path, col, cx, cy);
|
||||
Gtk::TreeModel::iterator iter = _snapshot_model->get_iter (path);
|
||||
if (iter) {
|
||||
Gtk::TreeModel::Row row = *iter;
|
||||
popup_context_menu (ev->button, ev->time, row[_columns.real_name]);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -208,110 +189,44 @@ EditorSnapshots::redisplay ()
|
|||
return;
|
||||
}
|
||||
|
||||
//fill the snapshots pane
|
||||
{
|
||||
vector<std::string> state_file_paths;
|
||||
vector<std::string> 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;
|
||||
}
|
||||
|
||||
vector<string> state_file_names (get_file_names_no_extension(state_file_paths));
|
||||
|
||||
_snap_model->clear ();
|
||||
|
||||
for (vector<string>::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);
|
||||
}
|
||||
|
||||
std::string s = Glib::build_filename (_session->path(), statename + ARDOUR::statefile_suffix);
|
||||
|
||||
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");
|
||||
}
|
||||
if (state_file_paths.empty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
//fill the backup pane
|
||||
|
||||
vector<string> state_file_names (get_file_names_no_extension(state_file_paths));
|
||||
|
||||
_snapshot_model->clear ();
|
||||
|
||||
for (vector<string>::iterator i = state_file_names.begin(); i != state_file_names.end(); ++i)
|
||||
{
|
||||
vector<std::string> state_file_paths;
|
||||
string statename = (*i);
|
||||
TreeModel::Row row = *(_snapshot_model->append());
|
||||
|
||||
get_state_files_in_directory (_session->session_directory().backup_path(),
|
||||
state_file_paths);
|
||||
/* this lingers on in case we ever want to change the visible
|
||||
name of the snapshot.
|
||||
*/
|
||||
|
||||
if (state_file_paths.empty()) {
|
||||
return;
|
||||
string display_name;
|
||||
display_name = statename;
|
||||
|
||||
if (statename == _session->snap_name()) {
|
||||
_snapshot_display.get_selection()->select(row);
|
||||
}
|
||||
|
||||
vector<string> state_file_names (get_file_names_no_extension(state_file_paths));
|
||||
std::string s = Glib::build_filename (_session->path(), statename + ARDOUR::statefile_suffix);
|
||||
|
||||
_back_model->clear ();
|
||||
GStatBuf gsb;
|
||||
g_stat (s.c_str(), &gsb);
|
||||
Glib::DateTime gdt(Glib::DateTime::create_now_local (gsb.st_mtime));
|
||||
|
||||
for (vector<string>::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.
|
||||
*/
|
||||
|
||||
string display_name;
|
||||
display_name = statename;
|
||||
|
||||
std::string s = Glib::build_filename (_session->path(), statename + ARDOUR::statefile_suffix);
|
||||
|
||||
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];
|
||||
|
||||
//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);
|
||||
row[_columns.visible_name] = display_name;
|
||||
row[_columns.real_name] = statename;
|
||||
row[_columns.time_formatted] = gdt.format ("%F %H:%M");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,6 @@
|
|||
#include <gtkmm/scrolledwindow.h>
|
||||
#include <gtkmm/treemodel.h>
|
||||
#include <gtkmm/treeview.h>
|
||||
|
||||
#include "widgets/pane.h"
|
||||
|
||||
#include "editor_component.h"
|
||||
|
||||
class EditorSnapshots : public EditorComponent, public ARDOUR::SessionHandlePtr
|
||||
|
|
@ -37,17 +34,14 @@ public:
|
|||
void set_session (ARDOUR::Session *);
|
||||
|
||||
Gtk::Widget& widget () {
|
||||
return _pane;
|
||||
return _scroller;
|
||||
}
|
||||
|
||||
void redisplay ();
|
||||
|
||||
private:
|
||||
|
||||
ArdourWidgets::VPane _pane;
|
||||
|
||||
Gtk::ScrolledWindow _snap_scroller;
|
||||
Gtk::ScrolledWindow _back_scroller;
|
||||
Gtk::ScrolledWindow _scroller;
|
||||
|
||||
struct Columns : public Gtk::TreeModel::ColumnRecord {
|
||||
Columns () {
|
||||
|
|
@ -61,10 +55,8 @@ private:
|
|||
};
|
||||
|
||||
Columns _columns;
|
||||
Glib::RefPtr<Gtk::ListStore> _snap_model;
|
||||
Glib::RefPtr<Gtk::ListStore> _back_model;
|
||||
Gtk::TreeView _snap_display;
|
||||
Gtk::TreeView _back_display;
|
||||
Glib::RefPtr<Gtk::ListStore> _snapshot_model;
|
||||
Gtk::TreeView _snapshot_display;
|
||||
Gtk::Menu _menu;
|
||||
|
||||
bool button_press (GdkEventButton *);
|
||||
|
|
@ -72,8 +64,6 @@ private:
|
|||
void popup_context_menu (int, int32_t, std::string);
|
||||
void remove (std::string);
|
||||
void rename (std::string);
|
||||
|
||||
void backup_selection_changed ();
|
||||
};
|
||||
|
||||
#endif // __gtk_ardour_editor_snapshots_h__
|
||||
|
|
|
|||
Loading…
Reference in New Issue