X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_library.cc;h=3aa6d05be1fea88bc087318d349829c1583e8ab8;hb=f3e5450492109bb4fab898ae824e30ede28bf7b5;hp=1358ebd6d9be92613d8cab8b357452a513eea693;hpb=50a4504e488227182374b39c7ea50a1147f3557d;p=ardour.git

diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc
index 1358ebd6d9..3aa6d05be1 100644
--- a/libs/ardour/audio_library.cc
+++ b/libs/ardour/audio_library.cc
@@ -46,6 +46,8 @@ using namespace PBD;
 
 static char* SOUNDFILE = "http://ardour.org/ontology/Soundfile";
 
+string AudioLibrary::state_node_name = "AudioLibrary";
+
 AudioLibrary::AudioLibrary ()
 {
 //	sfdb_paths.push_back("/Users/taybin/sounds");
@@ -74,12 +76,6 @@ AudioLibrary::AudioLibrary ()
 	} 
 
 	lrdf_free_statements(matches);
-
-	XMLNode* state = instant_xml(X_("AudioLibrary"), get_user_ardour_path());
-	if (state) {
-		set_state(*state);
-	}
-	scan_paths();
 }
 
 AudioLibrary::~AudioLibrary ()
@@ -361,7 +357,7 @@ AudioLibrary::set_paths (vector<string> paths)
 {
 	sfdb_paths = paths;
 	
-	add_instant_xml(get_state(), get_user_ardour_path());
+	scan_paths ();
 }
 
 vector<string> 
@@ -436,9 +432,9 @@ AudioLibrary::safe_file_extension(string file)
         file.rfind(".vwe") == string::npos &&
         file.rfind(".paf") == string::npos &&
 #ifdef HAVE_COREAUDIO
-		file.rfind(".mp3") == string::npos &&
-		file.rfind(".aac") == string::npos &&
-		file.rfind(".mp4") == string::npos &&
+	file.rfind(".mp3") == string::npos &&
+	file.rfind(".aac") == string::npos &&
+	file.rfind(".mp4") == string::npos &&
 #endif // HAVE_COREAUDIO
         file.rfind(".voc") == string::npos);
 }
@@ -478,7 +474,7 @@ AudioLibrary::set_state (const XMLNode& node)
 		}
 	}
 	
-	sfdb_paths = paths;
+	set_paths (paths);
 	
 	return 0;
 }