X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_metadata.cc;h=10c39983df93fbd4b30c50e1e0a682808b1b850f;hb=9e0d03020ff47773f7d1c0414de1c74e6c9e0dac;hp=8f3680e7b1ff0e17e88c9f4159f1669ae0621b9a;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/session_metadata.cc b/libs/ardour/session_metadata.cc
index 8f3680e7b1..10c39983df 100644
--- 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
@@ -22,11 +22,12 @@
 #include <iostream>
 #include <sstream>
 
+using namespace std;
+using namespace Glib;
 using namespace ARDOUR;
 
-
 SessionMetadata::SessionMetadata ()
-{	
+{
 	/*** General ***/
 	map.insert (Property ("comment", ""));
 	map.insert (Property ("copyright", ""));
@@ -93,11 +94,11 @@ SessionMetadata::get_xml (const ustring & name)
 	if (value.empty()) {
 		return 0;
 	}
-	
+
 	XMLNode val ("value", value);
 	XMLNode * node = new XMLNode (name);
 	node->add_child_copy (val);
-	
+
 	return node;
 }
 
@@ -110,7 +111,7 @@ SessionMetadata::get_value (const ustring & name) const
 		std::cerr << "Programming error in SessionMetadata::get_value" << std::endl;
 		return "";
 	}
-	
+
 	return it->second;
 }
 
@@ -129,7 +130,7 @@ SessionMetadata::set_value (const ustring & name, const ustring & value)
 		std::cerr << "Programming error in SessionMetadata::set_value" << std::endl;
 		return;
 	}
-	
+
 	it->second = value;
 }
 
@@ -151,37 +152,37 @@ SessionMetadata::get_state ()
 {
 	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);
 		}
 	}
-	
+
 	return *node;
 }
 
 int
-SessionMetadata::set_state (const XMLNode & state)
+SessionMetadata::set_state (const XMLNode & state, int /*version*/)
 {
 	const XMLNodeList & children = state.children();
 	ustring name;
 	ustring value;
 	XMLNode * node;
-	
+
 	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();
-		
+
 		set_value (name, value);
 	}
-	
+
 	return 0;
 }