X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_metadata_dialog.cc;h=1bc776122bf7c8130098dc06b40b04d0bdb26800;hb=91c057494be9f97020211ee1855c2d1d190df95c;hp=6feec36fdf87dca68f0f1619e85491008350c69b;hpb=64dc5427e4f5339a16a018692dd94f476c53cae9;p=ardour.git
diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 6feec36fdf..1bc776122b 100644
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -37,7 +37,7 @@ using namespace Glib;
/*** MetadataField ***/
-MetadataField::MetadataField (ustring const & field_name) :
+MetadataField::MetadataField (string const & field_name) :
_name (field_name)
{
}
@@ -46,7 +46,7 @@ MetadataField::~MetadataField() { }
/* TextMetadataField */
-TextMetadataField::TextMetadataField (Getter getter, Setter setter, ustring const & field_name, guint width ) :
+TextMetadataField::TextMetadataField (Getter getter, Setter setter, string const & field_name, guint width ) :
MetadataField (field_name),
getter (getter),
setter (setter),
@@ -112,7 +112,7 @@ TextMetadataField::update_value ()
/* NumberMetadataField */
-NumberMetadataField::NumberMetadataField (Getter getter, Setter setter, ustring const & field_name, guint numbers, guint width) :
+NumberMetadataField::NumberMetadataField (Getter getter, Setter setter, string const & field_name, guint numbers, guint width) :
MetadataField (field_name),
getter (getter),
setter (setter),
@@ -183,7 +183,7 @@ NumberMetadataField::edit_widget ()
return *entry;
}
-ustring
+string
NumberMetadataField::uint_to_str (uint32_t i) const
{
std::ostringstream oss ("");
@@ -196,11 +196,11 @@ NumberMetadataField::uint_to_str (uint32_t i) const
}
uint32_t
-NumberMetadataField::str_to_uint (ustring const & str) const
+NumberMetadataField::str_to_uint (string const & str) const
{
- ustring tmp (str);
- ustring::size_type i;
- while ((i = tmp.find_first_not_of("1234567890")) != ustring::npos) {
+ string tmp (str);
+ string::size_type i;
+ while ((i = tmp.find_first_not_of("1234567890")) != string::npos) {
tmp.erase (i, 1);
}
@@ -213,10 +213,9 @@ NumberMetadataField::str_to_uint (ustring const & str) const
/* SessionMetadataSet */
-SessionMetadataSet::SessionMetadataSet (ustring const & name) :
- name (name)
+SessionMetadataSet::SessionMetadataSet (string const & name)
+ : name (name)
{
- session = 0;
}
void
@@ -227,8 +226,8 @@ SessionMetadataSet::add_data_field (MetadataPtr field)
/* SessionMetadataSetEditable */
-SessionMetadataSetEditable::SessionMetadataSetEditable (ustring const & name) :
- SessionMetadataSet (name)
+SessionMetadataSetEditable::SessionMetadataSetEditable (string const & name)
+ : SessionMetadataSet (name)
{
table.set_row_spacings (6);
table.set_col_spacings (12);
@@ -247,9 +246,13 @@ SessionMetadataSetEditable::get_tab_widget ()
void
SessionMetadataSetEditable::set_session (ARDOUR::Session * s)
{
- session = s;
+ SessionHandlePtr::set_session (s);
- ARDOUR::SessionMetadata const & data = session->metadata();
+ if (!_session) {
+ return;
+ }
+
+ ARDOUR::SessionMetadata const & data = _session->metadata();
table.resize (list.size(), 2);
uint32_t row = 0;
@@ -266,7 +269,7 @@ SessionMetadataSetEditable::set_session (ARDOUR::Session * s)
void
SessionMetadataSetEditable::save_data ()
{
- ARDOUR::SessionMetadata & data = session->metadata();
+ ARDOUR::SessionMetadata & data = _session->metadata();
for (DataList::const_iterator it = list.begin(); it != list.end(); ++it) {
(*it)->save_data(data);
}
@@ -274,9 +277,9 @@ SessionMetadataSetEditable::save_data ()
/* SessionMetadataSetImportable */
-SessionMetadataSetImportable::SessionMetadataSetImportable (ustring const & name) :
- SessionMetadataSet (name),
- session_list (list)
+SessionMetadataSetImportable::SessionMetadataSetImportable (string const & name)
+ : SessionMetadataSet (name)
+ , session_list (list)
{
tree = Gtk::ListStore::create (tree_cols);
tree_view.set_model (tree);
@@ -300,8 +303,6 @@ SessionMetadataSetImportable::SessionMetadataSetImportable (ustring const & name
tree_view.append_column (*viewcol);
select_all_check.signal_toggled().connect (sigc::mem_fun(*this, &SessionMetadataSetImportable::select_all));
-
- session = 0;
}
Gtk::Widget &
@@ -321,12 +322,12 @@ SessionMetadataSetImportable::get_select_all_widget ()
void
SessionMetadataSetImportable::load_extra_data (ARDOUR::SessionMetadata const & data)
{
- if (!session) {
+ if (!_session) {
std::cerr << "Programming error: no session set for SessionMetaDataSetImportable (in load_data)!" << std::endl;
return;
}
- ARDOUR::SessionMetadata & session_data = session->metadata();
+ ARDOUR::SessionMetadata & session_data = _session->metadata();
MetadataPtr session_field;
MetadataPtr import_field;
@@ -350,8 +351,8 @@ SessionMetadataSetImportable::load_extra_data (ARDOUR::SessionMetadata const & d
import_field->load_data(data); // hasn't been done yet
// Make string for values TODO get color from somewhere?
- ustring values = "" + session_field->value() + "\n"
- + "" + import_field->value() + "";
+ string values = "" + session_field->value() + "\n"
+ + "" + import_field->value() + "";
Gtk::TreeModel::iterator row_iter = tree->append();
Gtk::TreeModel::Row row = *row_iter;
@@ -369,12 +370,12 @@ SessionMetadataSetImportable::load_extra_data (ARDOUR::SessionMetadata const & d
void
SessionMetadataSetImportable::save_data ()
{
- if (!session) {
+ if (!_session) {
std::cerr << "Programming error: no session set for SessionMetaDataSetImportable (in import_data)!" << std::endl;
return;
}
- ARDOUR::SessionMetadata & session_data = session->metadata();
+ ARDOUR::SessionMetadata & session_data = _session->metadata();
Gtk::TreeModel::Children fields = tree->children();
Gtk::TreeModel::Children::iterator it;
@@ -400,7 +401,7 @@ SessionMetadataSetImportable::select_all ()
}
void
-SessionMetadataSetImportable::selection_changed (ustring const & path)
+SessionMetadataSetImportable::selection_changed (string const & path)
{
select_all_check.set_inconsistent (true);
@@ -412,7 +413,7 @@ SessionMetadataSetImportable::selection_changed (ustring const & path)
/* SessionMetadataDialog */
template
-SessionMetadataDialog::SessionMetadataDialog (ustring const & name) :
+SessionMetadataDialog::SessionMetadataDialog (string const & name) :
ArdourDialog (name, true)
{
cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
@@ -425,7 +426,7 @@ template
void
SessionMetadataDialog::init_data ()
{
- if (!session) {
+ if (!_session) {
std::cerr << "Programming error: no session set for SessionMetaDataDialog (in init_data)!" << std::endl;
return;
}
@@ -435,7 +436,7 @@ SessionMetadataDialog::init_data ()
init_people_data ();
for (DataSetList::iterator it = data_list.begin(); it != data_list.end(); ++it) {
- (*it)->set_session (session);
+ (*it)->set_session (_session);
notebook.append_page ((*it)->get_widget(), (*it)->get_tab_widget());
}
@@ -476,7 +477,7 @@ SessionMetadataDialog::end_dialog ()
template
void
-SessionMetadataDialog::warn_user (ustring const & string)
+SessionMetadataDialog::warn_user (string const & string)
{
Gtk::MessageDialog msg (string, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true);
msg.run();
@@ -659,7 +660,7 @@ SessionMetadataImporter::~SessionMetadataImporter ()
void
SessionMetadataImporter::run ()
{
- if (!session) {
+ if (!_session) {
std::cerr << "Programming error: no session set for SessionMetaDataImporter (in run)!" << std::endl;
return;
}
@@ -673,7 +674,7 @@ SessionMetadataImporter::run ()
Gtk::FileFilter session_filter;
session_filter.add_pattern ("*.ardour");
- session_filter.set_name (_("Ardour sessions"));
+ session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
session_selector.add_filter (session_filter);
session_selector.set_filter (session_filter);
@@ -704,7 +705,7 @@ SessionMetadataImporter::run ()
string filename = Glib::build_filename (path, name + ".ardour");
XMLTree session_tree;
if (!session_tree.read (filename)) {
- warn_user (_("A proper ardour session file was not selected!"));
+ warn_user (_("This session file could not be read!"));
return;
}