projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lingering references to old persist extension.
[ardour.git]
/
libs
/
ardour
/
session_metadata.cc
diff --git
a/libs/ardour/session_metadata.cc
b/libs/ardour/session_metadata.cc
index 7eb24e758648666d1617cb8e1d6d6731aaa2598b..51dba7ceff847183a288969be9034afbb02f6b72 100644
(file)
--- a/
libs/ardour/session_metadata.cc
+++ b/
libs/ardour/session_metadata.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2008 Paul Davis
+ Copyright (C) 2008 Paul Davis
Author: Sakari Bergen
This program is free software; you can redistribute it and/or modify it
Author: Sakari Bergen
This program is free software; you can redistribute it and/or modify it
@@
-17,16
+17,17
@@
675 Mass Ave, Cambridge, MA 02139, USA.
*/
675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include
<ardour/session_metadata.h>
+#include
"ardour/session_metadata.h"
#include <iostream>
#include <sstream>
#include <iostream>
#include <sstream>
+using namespace std;
+using namespace Glib;
using namespace ARDOUR;
using namespace ARDOUR;
-
SessionMetadata::SessionMetadata ()
SessionMetadata::SessionMetadata ()
-{
+{
/*** General ***/
map.insert (Property ("comment", ""));
map.insert (Property ("copyright", ""));
/*** General ***/
map.insert (Property ("comment", ""));
map.insert (Property ("copyright", ""));
@@
-87,22
+88,22
@@
SessionMetadata::~SessionMetadata ()
}
XMLNode *
}
XMLNode *
-SessionMetadata::get_xml (const
u
string & name)
+SessionMetadata::get_xml (const string & name)
{
{
-
u
string value = get_value (name);
+ string value = get_value (name);
if (value.empty()) {
return 0;
}
if (value.empty()) {
return 0;
}
-
+
XMLNode val ("value", value);
XMLNode * node = new XMLNode (name);
node->add_child_copy (val);
XMLNode val ("value", value);
XMLNode * node = new XMLNode (name);
node->add_child_copy (val);
-
+
return node;
}
return node;
}
-
u
string
-SessionMetadata::get_value (const
u
string & name) const
+string
+SessionMetadata::get_value (const string & name) const
{
PropertyMap::const_iterator it = map.find (name);
if (it == map.end()) {
{
PropertyMap::const_iterator it = map.find (name);
if (it == map.end()) {
@@
-110,18
+111,18
@@
SessionMetadata::get_value (const ustring & name) const
std::cerr << "Programming error in SessionMetadata::get_value" << std::endl;
return "";
}
std::cerr << "Programming error in SessionMetadata::get_value" << std::endl;
return "";
}
-
+
return it->second;
}
uint32_t
return it->second;
}
uint32_t
-SessionMetadata::get_uint_value (const
u
string & name) const
+SessionMetadata::get_uint_value (const string & name) const
{
return atoi (get_value (name).c_str());
}
void
{
return atoi (get_value (name).c_str());
}
void
-SessionMetadata::set_value (const
ustring & name, const u
string & value)
+SessionMetadata::set_value (const
string & name, const
string & value)
{
PropertyMap::iterator it = map.find (name);
if (it == map.end()) {
{
PropertyMap::iterator it = map.find (name);
if (it == map.end()) {
@@
-129,12
+130,12
@@
SessionMetadata::set_value (const ustring & name, const ustring & value)
std::cerr << "Programming error in SessionMetadata::set_value" << std::endl;
return;
}
std::cerr << "Programming error in SessionMetadata::set_value" << std::endl;
return;
}
-
+
it->second = value;
}
void
it->second = value;
}
void
-SessionMetadata::set_value (const
u
string & name, uint32_t value)
+SessionMetadata::set_value (const string & name, uint32_t value)
{
std::ostringstream oss;
oss << value;
{
std::ostringstream oss;
oss << value;
@@
-151,54
+152,54
@@
SessionMetadata::get_state ()
{
XMLNode * node = new XMLNode ("Metadata");
XMLNode * prop;
{
XMLNode * node = new XMLNode ("Metadata");
XMLNode * prop;
-
+
for (PropertyMap::const_iterator it = map.begin(); it != map.end(); ++it) {
if ((prop = get_xml (it->first))) {
node->add_child_nocopy (*prop);
}
}
for (PropertyMap::const_iterator it = map.begin(); it != map.end(); ++it) {
if ((prop = get_xml (it->first))) {
node->add_child_nocopy (*prop);
}
}
-
+
return *node;
}
int
return *node;
}
int
-SessionMetadata::set_state (const XMLNode & state)
+SessionMetadata::set_state (const XMLNode & state
, int /*version*/
)
{
const XMLNodeList & children = state.children();
{
const XMLNodeList & children = state.children();
-
u
string name;
-
u
string value;
+ string name;
+ string value;
XMLNode * node;
XMLNode * node;
-
+
for (XMLNodeConstIterator it = children.begin(); it != children.end(); it++) {
node = *it;
if (node->children().empty()) {
continue;
}
for (XMLNodeConstIterator it = children.begin(); it != children.end(); it++) {
node = *it;
if (node->children().empty()) {
continue;
}
-
+
name = node->name();
node = *node->children().begin();
value = node->content();
name = node->name();
node = *node->children().begin();
value = node->content();
-
+
set_value (name, value);
}
set_value (name, value);
}
-
+
return 0;
}
/*** Accessing ***/
return 0;
}
/*** Accessing ***/
-
u
string
+string
SessionMetadata::comment () const
{
return get_value("comment");
}
SessionMetadata::comment () const
{
return get_value("comment");
}
-
u
string
+string
SessionMetadata::copyright () const
{
return get_value("copyright");
}
SessionMetadata::copyright () const
{
return get_value("copyright");
}
-
u
string
+string
SessionMetadata::isrc () const
{
return get_value("isrc");
SessionMetadata::isrc () const
{
return get_value("isrc");
@@
-210,103
+211,103
@@
SessionMetadata::year () const
return get_uint_value("year");
}
return get_uint_value("year");
}
-
u
string
+string
SessionMetadata::grouping () const
{
return get_value("grouping");
}
SessionMetadata::grouping () const
{
return get_value("grouping");
}
-
u
string
+string
SessionMetadata::title () const
{
return get_value("title");
}
SessionMetadata::title () const
{
return get_value("title");
}
-
u
string
+string
SessionMetadata::subtitle () const
{
return get_value("subtitle");
}
SessionMetadata::subtitle () const
{
return get_value("subtitle");
}
-
u
string
+string
SessionMetadata::artist () const
{
return get_value("artist");
}
SessionMetadata::artist () const
{
return get_value("artist");
}
-
u
string
+string
SessionMetadata::album_artist () const
{
return get_value("album_artist");
}
SessionMetadata::album_artist () const
{
return get_value("album_artist");
}
-
u
string
+string
SessionMetadata::lyricist () const
{
return get_value("lyricist");
}
SessionMetadata::lyricist () const
{
return get_value("lyricist");
}
-
u
string
+string
SessionMetadata::composer () const
{
return get_value("composer");
}
SessionMetadata::composer () const
{
return get_value("composer");
}
-
u
string
+string
SessionMetadata::conductor () const
{
return get_value("conductor");
}
SessionMetadata::conductor () const
{
return get_value("conductor");
}
-
u
string
+string
SessionMetadata::remixer () const
{
return get_value("remixer");
}
SessionMetadata::remixer () const
{
return get_value("remixer");
}
-
u
string
+string
SessionMetadata::arranger () const
{
return get_value("arranger");
}
SessionMetadata::arranger () const
{
return get_value("arranger");
}
-
u
string
+string
SessionMetadata::engineer () const
{
return get_value("engineer");
}
SessionMetadata::engineer () const
{
return get_value("engineer");
}
-
u
string
+string
SessionMetadata::producer () const
{
return get_value("producer");
}
SessionMetadata::producer () const
{
return get_value("producer");
}
-
u
string
+string
SessionMetadata::dj_mixer () const
{
return get_value("dj_mixer");
}
SessionMetadata::dj_mixer () const
{
return get_value("dj_mixer");
}
-
u
string
+string
SessionMetadata::mixer () const
{
return get_value("mixer");
}
SessionMetadata::mixer () const
{
return get_value("mixer");
}
-
u
string
+string
SessionMetadata::album () const
{
return get_value("album");
}
SessionMetadata::album () const
{
return get_value("album");
}
-
u
string
+string
SessionMetadata::compilation () const
{
return get_value("compilation");
}
SessionMetadata::compilation () const
{
return get_value("compilation");
}
-
u
string
+string
SessionMetadata::disc_subtitle () const
{
return get_value("disc_subtitle");
SessionMetadata::disc_subtitle () const
{
return get_value("disc_subtitle");
@@
-336,7
+337,7
@@
SessionMetadata::total_tracks () const
return get_uint_value("total_tracks");
}
return get_uint_value("total_tracks");
}
-
u
string
+string
SessionMetadata::genre () const
{
return get_value("genre");
SessionMetadata::genre () const
{
return get_value("genre");
@@
-344,19
+345,19
@@
SessionMetadata::genre () const
/*** Editing ***/
void
/*** Editing ***/
void
-SessionMetadata::set_comment (const
u
string & v)
+SessionMetadata::set_comment (const string & v)
{
set_value ("comment", v);
}
void
{
set_value ("comment", v);
}
void
-SessionMetadata::set_copyright (const
u
string & v)
+SessionMetadata::set_copyright (const string & v)
{
set_value ("copyright", v);
}
void
{
set_value ("copyright", v);
}
void
-SessionMetadata::set_isrc (const
u
string & v)
+SessionMetadata::set_isrc (const string & v)
{
set_value ("isrc", v);
}
{
set_value ("isrc", v);
}
@@
-368,103
+369,103
@@
SessionMetadata::set_year (uint32_t v)
}
void
}
void
-SessionMetadata::set_grouping (const
u
string & v)
+SessionMetadata::set_grouping (const string & v)
{
set_value ("grouping", v);
}
void
{
set_value ("grouping", v);
}
void
-SessionMetadata::set_title (const
u
string & v)
+SessionMetadata::set_title (const string & v)
{
set_value ("title", v);
}
void
{
set_value ("title", v);
}
void
-SessionMetadata::set_subtitle (const
u
string & v)
+SessionMetadata::set_subtitle (const string & v)
{
set_value ("subtitle", v);
}
void
{
set_value ("subtitle", v);
}
void
-SessionMetadata::set_artist (const
u
string & v)
+SessionMetadata::set_artist (const string & v)
{
set_value ("artist", v);
}
void
{
set_value ("artist", v);
}
void
-SessionMetadata::set_album_artist (const
u
string & v)
+SessionMetadata::set_album_artist (const string & v)
{
set_value ("album_artist", v);
}
void
{
set_value ("album_artist", v);
}
void
-SessionMetadata::set_lyricist (const
u
string & v)
+SessionMetadata::set_lyricist (const string & v)
{
set_value ("lyricist", v);
}
void
{
set_value ("lyricist", v);
}
void
-SessionMetadata::set_composer (const
u
string & v)
+SessionMetadata::set_composer (const string & v)
{
set_value ("composer", v);
}
void
{
set_value ("composer", v);
}
void
-SessionMetadata::set_conductor (const
u
string & v)
+SessionMetadata::set_conductor (const string & v)
{
set_value ("conductor", v);
}
void
{
set_value ("conductor", v);
}
void
-SessionMetadata::set_remixer (const
u
string & v)
+SessionMetadata::set_remixer (const string & v)
{
set_value ("remixer", v);
}
void
{
set_value ("remixer", v);
}
void
-SessionMetadata::set_arranger (const
u
string & v)
+SessionMetadata::set_arranger (const string & v)
{
set_value ("arranger", v);
}
void
{
set_value ("arranger", v);
}
void
-SessionMetadata::set_engineer (const
u
string & v)
+SessionMetadata::set_engineer (const string & v)
{
set_value ("engineer", v);
}
void
{
set_value ("engineer", v);
}
void
-SessionMetadata::set_producer (const
u
string & v)
+SessionMetadata::set_producer (const string & v)
{
set_value ("producer", v);
}
void
{
set_value ("producer", v);
}
void
-SessionMetadata::set_dj_mixer (const
u
string & v)
+SessionMetadata::set_dj_mixer (const string & v)
{
set_value ("dj_mixer", v);
}
void
{
set_value ("dj_mixer", v);
}
void
-SessionMetadata::set_mixer (const
u
string & v)
+SessionMetadata::set_mixer (const string & v)
{
set_value ("mixer", v);
}
void
{
set_value ("mixer", v);
}
void
-SessionMetadata::set_album (const
u
string & v)
+SessionMetadata::set_album (const string & v)
{
set_value ("album", v);
}
void
{
set_value ("album", v);
}
void
-SessionMetadata::set_compilation (const
u
string & v)
+SessionMetadata::set_compilation (const string & v)
{
set_value ("compilation", v);
}
void
{
set_value ("compilation", v);
}
void
-SessionMetadata::set_disc_subtitle (const
u
string & v)
+SessionMetadata::set_disc_subtitle (const string & v)
{
set_value ("disc_subtitle", v);
}
{
set_value ("disc_subtitle", v);
}
@@
-494,7
+495,7
@@
SessionMetadata::set_total_tracks (uint32_t v)
}
void
}
void
-SessionMetadata::set_genre (const
u
string & v)
+SessionMetadata::set_genre (const string & v)
{
set_value ("genre", v);
}
{
set_value ("genre", v);
}