Updated config.guess file

Added mac specific ardour2_mac_ui.rc file
Fixed some memory leaks in add_instant_xml() usage.
Added EXTRA_WARN scons option for pedants.
Reformatted xml++.cc into something that wouldn't drive me insane.


git-svn-id: svn://localhost/ardour2/trunk@686 d708f5d6-7413-0410-9779-e7cbd77b26cf

SConstruct

@@ -31,6 +31,7 @@ opts.AddOptions(
     PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'),
     EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2),
     BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0),
+    BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic.  Might break compilation.  For pedants', 0),
     BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0),
     BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
     BoolOption('LIBLO', 'Compile with support for liblo library', 1),
@@ -818,6 +819,10 @@ else:
 env.Append(CCFLAGS="-Wall")
 env.Append(CXXFLAGS="-Woverloaded-virtual")
 
+if env['EXTRA_WARN']:
+    env.Append(CCFLAGS="-Wextra -pedantic")
+    env.Append(CXXFLAGS="-ansi")
+
 if env['LIBLO']:
     env.Append(CCFLAGS="-DHAVE_LIBLO")
 

gtk2_ardour/actions.cc

@@ -19,7 +19,7 @@
 */
 
 #include <vector>
-#include <string.h>
+#include <string>
 
 #include <gtk/gtkaccelmap.h>
 #include <gtk/gtkuimanager.h>

gtk2_ardour/ardour_ui.cc

@@ -339,15 +339,15 @@ ARDOUR_UI::save_ardour_state ()
 	Config->add_extra_xml (*node);
 	Config->save_state();
 
-	XMLNode& enode (static_cast<Stateful*>(editor)->get_state());
+	XMLNode* enode = new XMLNode (static_cast<Stateful*>(editor)->get_state());
-	XMLNode& mnode (mixer->get_state());
+	XMLNode* mnode = new XMLNode (mixer->get_state());
 
 	if (session) {
-		session->add_instant_xml(enode, session->path());
+		session->add_instant_xml(*enode, session->path());
-		session->add_instant_xml(mnode, session->path());
+		session->add_instant_xml(*mnode, session->path());
 	} else {
-		Config->add_instant_xml(enode, get_user_ardour_path());
+		Config->add_instant_xml(*enode, get_user_ardour_path());
-		Config->add_instant_xml(mnode, get_user_ardour_path());
+		Config->add_instant_xml(*mnode, get_user_ardour_path());
 	}
 
 	/* keybindings */

gtk2_ardour/option_editor.cc

@@ -253,6 +253,7 @@ OptionEditor::setup_path_options()
 
 	sfdb_path_view.append_column(_("Paths"), sfdb_path_columns.paths);
 	sfdb_path_view.set_size_request(-1, 100);
+	sfdb_path_view.set_headers_visible (false);
 
 	path_table.show_all();
 }

libs/ardour/audio_library.cc

@@ -84,7 +84,6 @@ AudioLibrary::AudioLibrary ()
 
 AudioLibrary::~AudioLibrary ()
 {
-	add_instant_xml(get_state(), get_user_ardour_path());
 }
 
 void
@@ -361,6 +360,8 @@ void
 AudioLibrary::set_paths (vector<string> paths)
 {
 	sfdb_paths = paths;
+	
+	add_instant_xml(get_state(), get_user_ardour_path());
 }
 
 vector<string> 

libs/pbd/stateful.cc

@@ -82,7 +82,7 @@ Stateful::add_instant_xml (XMLNode& node, const string& dir)
 	}
 
 	_instant_xml->remove_nodes_and_delete (node.name());
-	_instant_xml->add_child_copy (node);
+	_instant_xml->add_child_nocopy (node);
 	
 	XMLTree tree;
 	tree.set_filename(dir+"/instant.xml");

libs/pbd/xml++.cc

@@ -44,11 +44,11 @@ XMLTree::~XMLTree()
 int 
 XMLTree::set_compression(int c)
 {
-    if (c > 9)
+	if (c > 9) {
 	    	c = 9;
-
+	} else if (c < 0) {
-    if (c < 0)
 	    	c = 0;
+	}
 	
 	_compression = c;
 	
@@ -119,8 +119,9 @@ XMLTree::write(void) const
 	result = xmlSaveFormatFile(_filename.c_str(), doc, 1);
 	xmlFreeDoc(doc);
 	
-    if (result == -1)
+	if (result == -1) {
 		return false;
+	}
 	
 	return true;
 }
@@ -165,15 +166,15 @@ XMLTree::write_buffer(void) const
 XMLNode::XMLNode(const string & n)
 	:  _name(n), _is_content(false), _content(string())
 {
-
+	if (_name.empty()) {
-    if (_name.empty())
 		_initialized = false;
-    else
+	} else {
 		_initialized = true;
 	}
+}
 
 XMLNode::XMLNode(const string & n, const string & c)
-	:_name(string()), _is_content(true), _content(c)
+	:_name(n), _is_content(true), _content(c)
 {
 	_initialized = true;
 }
@@ -190,35 +191,38 @@ XMLNode::XMLNode(const XMLNode& from)
 	set_content(from.content());
 	
 	props = from.properties();
-    for (curprop = props.begin(); curprop != props.end(); curprop++)
+	for (curprop = props.begin(); curprop != props.end(); ++curprop) {
 		add_property((*curprop)->name().c_str(), (*curprop)->value());
+	}
 	
 	nodes = from.children();
-    for (curnode = nodes.begin(); curnode != nodes.end(); curnode++)
+	for (curnode = nodes.begin(); curnode != nodes.end(); ++curnode) {
 		add_child_copy(**curnode);
 	}
+}
 
 XMLNode::~XMLNode()
 {
 	XMLNodeIterator curchild;
 	XMLPropertyIterator curprop;
 	
-    for (curchild = _children.begin(); curchild != _children.end();
+	for (curchild = _children.begin(); curchild != _children.end();	++curchild) {
-			curchild++)
 		delete *curchild;
+	}
 	    
-    for (curprop = _proplist.begin(); curprop != _proplist.end();
+	for (curprop = _proplist.begin(); curprop != _proplist.end(); ++curprop) {
-			curprop++)
 		delete *curprop;
 	}
+}
 
 const string & 
 XMLNode::set_content(const string & c)
 {
-    if (c.empty())
+	if (c.empty()) {
 		_is_content = false;
-    else
+	} else {
 		_is_content = true;
+	}
 	    
 	_content = c;
 	
@@ -231,14 +235,17 @@ XMLNode::children(const string & n) const
 	static XMLNodeList retval;
 	XMLNodeConstIterator cur;
 	
-    if (n.length() == 0)
+	if (n.length() == 0) {
 		return _children;
+	}
 	    
 	retval.erase(retval.begin(), retval.end());
 	
-    for (cur = _children.begin(); cur != _children.end(); cur++)
+	for (cur = _children.begin(); cur != _children.end(); ++cur) {
-		if ((*cur)->name() == n)
+		if ((*cur)->name() == n) {
 			retval.insert(retval.end(), *cur);
+		}
+	}
 	    
 	return retval;
 }
@@ -273,8 +280,10 @@ XMLProperty *
 XMLNode::property(const char * n)
 {
 	string ns(n);
-	if (_propmap.find(ns) == _propmap.end())
+	if (_propmap.find(ns) == _propmap.end()) {
 		return 0;
+	}
+	
 	return _propmap[ns];
 }
 
@@ -288,8 +297,9 @@ XMLNode::add_property(const char * n, const string & v)
 
 	XMLProperty *tmp = new XMLProperty(ns, v);
 
-	if (!tmp)
+	if (!tmp) {
 		return 0;
+	}
 
 	_propmap[tmp->name()] = tmp;
 	_proplist.insert(_proplist.end(), tmp);
@@ -364,32 +374,35 @@ readnode(xmlNodePtr node)
 	XMLNode *tmp;
 	xmlAttrPtr attr;
 	
-    if (node->name)
+	if (node->name) {
 		name = (char *) node->name;
+	}
 	
 	tmp = new XMLNode(name);
 	
 	for (attr = node->properties; attr; attr = attr->next) {
 		content = "";
-		if (attr->children)
+		if (attr->children) {
 			content = (char *) attr->children->content;
+		}
 		tmp->add_property((char *) attr->name, content);
 	}
 	
-    if (node->content)
+	if (node->content) {
 		tmp->set_content((char *) node->content);
-    else
+	} else {
 		tmp->set_content(string());
+	}
 	
-    for (child = node->children; child; child = child->next)
+	for (child = node->children; child; child = child->next) {
 		tmp->add_child_nocopy (*readnode(child));
+	}
 	
 	return tmp;
 }
 
 static void 
-writenode(xmlDocPtr doc, XMLNode * n, xmlNodePtr p, int root =
+writenode(xmlDocPtr doc, XMLNode * n, xmlNodePtr p, int root = 0)
-		      0)
 {
 	XMLPropertyList props;
 	XMLPropertyIterator curprop;
@@ -397,26 +410,24 @@ writenode(xmlDocPtr doc, XMLNode * n, xmlNodePtr p, int root =
 	XMLNodeIterator curchild;
 	xmlNodePtr node;
 	
-    if (root)
+	if (root) {
-		node = doc->children =
+		node = doc->children = xmlNewDocNode(doc, 0, (xmlChar *) n->name().c_str(), 0);
-			    xmlNewDocNode(doc, 0, (xmlChar *) n->name().c_str(), 0);
+	} else {
-
-    else
 		node = xmlNewChild(p, 0, (xmlChar *) n->name().c_str(), 0);
+	}
 	    
 	if (n->is_content()) {
 		node->type = XML_TEXT_NODE;
-		xmlNodeSetContentLen(node, (const xmlChar *) n->content().c_str(),
+		xmlNodeSetContentLen(node, (const xmlChar *) n->content().c_str(), n->content().length());
-			     n->content().length());
 	}
 	
 	props = n->properties();
-    for (curprop = props.begin(); curprop != props.end(); curprop++)
+	for (curprop = props.begin(); curprop != props.end(); ++curprop) {
-		xmlSetProp(node, (xmlChar *) (*curprop)->name().c_str(),
+		xmlSetProp(node, (xmlChar *) (*curprop)->name().c_str(), (xmlChar *) (*curprop)->value().c_str());
-			   (xmlChar *) (*curprop)->value().c_str());
+	}
 	    
 	children = n->children();
-    for (curchild = children.begin(); curchild != children.end();
+	for (curchild = children.begin(); curchild != children.end(); ++curchild) {
-			 curchild++)
 		writenode(doc, *curchild, node);
 	}
+}

tools/.cvsignore

@@ -1,3 +0,0 @@
-ard_i18n
-Makefile.in
-Makefile