ardour/livetrax
13
0
Fork 0
Code

s/created with/modified with/

Browse Source 
Once a session has been saved by a more recent version or a different
variant, the session file is tied to that version/variant.

The created-with version is only for debug purposes and internal use.
This commit is contained in:
Robin Gareus 2017-09-21 02:00:05 +02:00
parent a42f6ff828
commit 0fd861d8de
6 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/add_route_dialog.cc
View File

@ -216,7 +216,7 @@ You may select:\n \
trk_template_chooser.set_model (trk_template_model);
trk_template_chooser.append_column (_("Template/Type"), track_template_columns.name);
#ifdef MIXBUS
trk_template_chooser.append_column (_("Created With"), track_template_columns.created_with);
trk_template_chooser.append_column (_("Modified With"), track_template_columns.modified_with);
#endif
trk_template_chooser.set_headers_visible (true);
trk_template_chooser.get_selection()->set_mode (SELECTION_SINGLE);
@ -925,7 +925,7 @@ AddRouteDialog::refill_channel_setups ()
row[track_template_columns.name] = (*i).first;
row[track_template_columns.path] = "";
row[track_template_columns.description] = (*i).second;
row[track_template_columns.created_with] = "";
row[track_template_columns.modified_with] = "";
if (!selected_default && !Profile->get_mixbus ()) {
trk_template_chooser.get_selection()->select(row);
@ -949,7 +949,7 @@ AddRouteDialog::refill_channel_setups ()
row[track_template_columns.name] = (*s)->name;
row[track_template_columns.path] = "urn:ardour:" + (*s)->path;
row[track_template_columns.description] = (*s)->description;
row[track_template_columns.created_with] = _("{Factory Template}");
row[track_template_columns.modified_with] = _("{Factory Template}");
if ((*s)->name == "Create Audio Tracks Interactively" && Profile->get_mixbus ()) {
trk_template_chooser.get_selection()->select(row);
@ -966,7 +966,7 @@ AddRouteDialog::refill_channel_setups ()
row[track_template_columns.name] = x->name;
row[track_template_columns.path] = x->path;
row[track_template_columns.description] = x->description;
row[track_template_columns.created_with] = x->created_with;
row[track_template_columns.modified_with] = x->modified_with;
}
set_popdown_strings (channel_combo, channel_combo_strings);

4
gtk2_ardour/add_route_dialog.h
View File

@ -124,13 +124,13 @@ private:
add (name);
add (path);
add (description);
add (created_with);
add (modified_with);
}
Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> path;
Gtk::TreeModelColumn<std::string> description;
Gtk::TreeModelColumn<std::string> created_with;
Gtk::TreeModelColumn<std::string> modified_with;
};
TrackTemplateColumns track_template_columns;

24
gtk2_ardour/session_dialog.cc
View File

@ -375,7 +375,7 @@ SessionDialog::setup_recent_sessions ()
recent_session_display.append_column (_("Session Name"), recent_session_columns.visible_name);
recent_session_display.append_column (_("Sample Rate"), recent_session_columns.sample_rate);
#ifdef MIXBUS
recent_session_display.append_column (_("Created With"), recent_session_columns.created_with);
recent_session_display.append_column (_("Modified With"), recent_session_columns.modified_with);
#else
recent_session_display.append_column (_("File Resolution"), recent_session_columns.disk_format);
#endif
@ -580,8 +580,8 @@ SessionDialog::populate_session_templates ()
row[session_template_columns.name] = (*s)->name;
row[session_template_columns.path] = "urn:ardour:" + (*s)->path;
row[session_template_columns.description] = (*s)->description;
row[session_template_columns.created_with_short] = _("{Factory Template}");
row[session_template_columns.created_with_long] = _("{Factory Template}");
row[session_template_columns.modified_with_short] = _("{Factory Template}");
row[session_template_columns.modified_with_long] = _("{Factory Template}");
}
/* Add Lua Action Scripts which can also be used for session-setup */
@ -594,8 +594,8 @@ SessionDialog::populate_session_templates ()
row[session_template_columns.name] = (*s)->name;
row[session_template_columns.path] = "urn:ardour:" + (*s)->path;
row[session_template_columns.description] = (*s)->description;
row[session_template_columns.created_with_short] = _("{Factory Template}");
row[session_template_columns.created_with_long] = _("{Factory Template}");
row[session_template_columns.modified_with_short] = _("{Factory Template}");
row[session_template_columns.modified_with_long] = _("{Factory Template}");
}
@ -608,8 +608,8 @@ SessionDialog::populate_session_templates ()
row[session_template_columns.name] = (*x).name;
row[session_template_columns.path] = (*x).path;
row[session_template_columns.description] = (*x).description;
row[session_template_columns.created_with_long] = (*x).created_with;
row[session_template_columns.created_with_short] = (*x).created_with.substr(0, (*x).created_with.find(" "));
row[session_template_columns.modified_with_long] = (*x).modified_with;
row[session_template_columns.modified_with_short] = (*x).modified_with.substr(0, (*x).modified_with.find(" "));
}
//Add an explicit 'Empty Template' item
@ -617,8 +617,8 @@ SessionDialog::populate_session_templates ()
row[session_template_columns.name] = (_("Empty Template"));
row[session_template_columns.path] = string();
row[session_template_columns.description] = _("An empty session with factory default settings.");
row[session_template_columns.created_with_short] = _("");
row[session_template_columns.created_with_long] = _("");
row[session_template_columns.modified_with_short] = _("");
row[session_template_columns.modified_with_long] = _("");
//auto-select the first item in the list
Gtk::TreeModel::Row first = template_model->children()[0];
@ -715,9 +715,9 @@ SessionDialog::setup_new_session_page ()
template_chooser.set_model (template_model);
template_chooser.append_column (_("Template"), session_template_columns.name);
#ifdef MIXBUS
template_chooser.append_column (_("Created With"), session_template_columns.created_with_short);
template_chooser.append_column (_("Modified With"), session_template_columns.modified_with_short);
#endif
template_chooser.set_tooltip_column(4); // created_with_long
template_chooser.set_tooltip_column(4); // modified_with_long
template_chooser.set_headers_visible (true);
template_chooser.get_selection()->set_mode (SELECTION_SINGLE);
template_chooser.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &SessionDialog::template_row_selected));
@ -867,7 +867,7 @@ SessionDialog::redisplay_recent_sessions ()
row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname);
} else {
row[recent_session_columns.tip] = Gtkmm2ext::markup_escape_text (dirname + "\n" + string_compose (_("Last modified with: %1"), program_version));
row[recent_session_columns.created_with] = program_version;
row[recent_session_columns.modified_with] = program_version;
}
++session_snapshot_count;

12
gtk2_ardour/session_dialog.h
View File

@ -113,7 +113,7 @@ private:
add (fullpath);
add (sample_rate);
add (disk_format);
add (created_with);
add (modified_with);
add (time_modified);
add (time_formatted);
}
@ -122,7 +122,7 @@ private:
Gtk::TreeModelColumn<std::string> fullpath;
Gtk::TreeModelColumn<std::string> sample_rate;
Gtk::TreeModelColumn<std::string> disk_format;
Gtk::TreeModelColumn<std::string> created_with;
Gtk::TreeModelColumn<std::string> modified_with;
Gtk::TreeModelColumn<int64_t> time_modified;
Gtk::TreeModelColumn<std::string> time_formatted;
};
@ -155,15 +155,15 @@ private:
add (name);
add (path);
add (description);
add (created_with_short);
add (created_with_long);
add (modified_with_short);
add (modified_with_long);
}
Gtk::TreeModelColumn<std::string> name;
Gtk::TreeModelColumn<std::string> path;
Gtk::TreeModelColumn<std::string> description;
Gtk::TreeModelColumn<std::string> created_with_short;
Gtk::TreeModelColumn<std::string> created_with_long;
Gtk::TreeModelColumn<std::string> modified_with_short;
Gtk::TreeModelColumn<std::string> modified_with_long;
};
SessionTemplateColumns session_template_columns;

2
libs/ardour/ardour/template_utils.h
View File

@ -38,7 +38,7 @@ namespace ARDOUR {
std::string name;
std::string path;
std::string description;
std::string created_with;
std::string modified_with;
};
LIBARDOUR_API void find_route_templates (std::vector<TemplateInfo>& template_names);

16
libs/ardour/template_utils.cc
View File

@ -110,14 +110,14 @@ find_session_templates (vector<TemplateInfo>& template_names, bool read_xml)
XMLNode* root = tree.root();
rti.created_with = _("(unknown)");
rti.modified_with = _("(unknown)");
try {
XMLNode *pv = root->child("ProgramVersion");
string created_with;
string modified_with;
if (pv != 0) {
pv->get_property (X_("created-with"), created_with);
pv->get_property (X_("modified-with"), modified_with);
}
rti.created_with = created_with;
rti.modified_with = modified_with;
} catch (XMLException &e) {}
rti.description = _("No Description");
@ -158,14 +158,14 @@ find_route_templates (vector<TemplateInfo>& template_names)
TemplateInfo rti;
rti.created_with = _("(unknown)");
rti.modified_with = _("(unknown)");
try {
XMLNode *pv = root->child("ProgramVersion");
string created_with;
string modified_with;
if (pv != 0) {
pv->get_property (X_("created-with"), created_with);
pv->get_property (X_("modified-with"), modified_with);
}
rti.created_with = created_with;
rti.modified_with = modified_with;
} catch (XMLException &e) {}
rti.description = _("No Description");