--- linuxsampler/trunk/src/network/lscpserver.cpp	2008/02/16 01:09:33	1695
+++ linuxsampler/trunk/src/network/lscpserver.cpp	2008/04/29 15:44:09	1727
@@ -21,6 +21,8 @@
  *   MA  02111-1307  USA                                                   *
  ***************************************************************************/
 
+#include <algorithm>
+
 #include "lscpserver.h"
 #include "lscpresultset.h"
 #include "lscpevent.h"
@@ -2555,7 +2557,7 @@
     LSCPResultSet result;
     try {
         if (dVolume < 0) throw Exception("Volume may not be negative");
-        GLOBAL_VOLUME = dVolume; // see common/global.cpp
+        GLOBAL_VOLUME = dVolume; // see common/global_private.cpp
         LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOLUME", GLOBAL_VOLUME));
     } catch (Exception e) {
         result.Error(e);
@@ -3096,6 +3098,44 @@
     } catch (Exception e) {
          result.Error(e);
     }
+#else
+    result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+#endif
+    return result.Produce();
+}
+
+String LSCPServer::SetDbInstrumentFilePath(String OldPath, String NewPath) {
+    dmsg(2,("LSCPServer: SetDbInstrumentFilePath(OldPath=%s,NewPath=%s)\n", OldPath.c_str(), NewPath.c_str()));
+    LSCPResultSet result;
+#if HAVE_SQLITE3
+    try {
+        InstrumentsDb::GetInstrumentsDb()->SetInstrumentFilePath(OldPath, NewPath);
+    } catch (Exception e) {
+         result.Error(e);
+    }
+#else
+    result.Error(String(DOESNT_HAVE_SQLITE3), 0);
+#endif
+    return result.Produce();
+}
+
+String LSCPServer::FindLostDbInstrumentFiles() {
+    dmsg(2,("LSCPServer: FindLostDbInstrumentFiles()\n"));
+    LSCPResultSet result;
+#if HAVE_SQLITE3
+    try {
+        String list;
+        StringListPtr pLostFiles = InstrumentsDb::GetInstrumentsDb()->FindLostInstrumentFiles();
+
+        for (int i = 0; i < pLostFiles->size(); i++) {
+            if (list != "") list += ",";
+            list += "'" + pLostFiles->at(i) + "'";
+        }
+
+        result.Add(list);
+    } catch (Exception e) {
+         result.Error(e);
+    }
 #else
     result.Error(String(DOESNT_HAVE_SQLITE3), 0);
 #endif