merge with master

[ardour.git] / libs / ardour / session_metadata.cc

diff --git a/libs/ardour/session_metadata.cc b/libs/ardour/session_metadata.cc
index 8e2a4ca057bfd2c285259e5782297f6b1873cfe6..e1eb166bb69daa99ee152d8625d3ec608aa11ae7 100644 (file)
--- a/libs/ardour/session_metadata.cc
+++ b/libs/ardour/session_metadata.cc
@@ -85,7 +85,7 @@ SessionMetadata::SessionMetadata ()
        //map.insert (Property ("album_sort", ""));
        //map.insert (Property ("album_artist_sort", ""));
        //map.insert (Property ("artist_sort", ""));
-       //map.insert (Property ("title_sort", ""));\
+       //map.insert (Property ("title_sort", ""));
        
        /*** Globals ***/
        user_map.insert (Property ("user_name", ""));
@@ -182,7 +182,7 @@ SessionMetadata::get_state ()
 }
 
 int
-SessionMetadata::set_state (const XMLNode & state, int version_num)
+SessionMetadata::set_state (const XMLNode & state, int /*version_num*/)
 {
        const XMLNodeList & children = state.children();
        string name;