--- linuxsampler/trunk/src/network/lscpserver.cpp	2008/09/11 18:11:06	1774
+++ linuxsampler/trunk/src/network/lscpserver.cpp	2009/02/16 17:56:50	1835
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <string>
 
+#include "../common/File.h"
 #include "lscpserver.h"
 #include "lscpresultset.h"
 #include "lscpevent.h"
@@ -334,6 +335,24 @@
 }
 #endif // HAVE_SQLITE3
 
+void LSCPServer::RemoveListeners() {
+    pSampler->RemoveChannelCountListener(&eventHandler);
+    pSampler->RemoveAudioDeviceCountListener(&eventHandler);
+    pSampler->RemoveMidiDeviceCountListener(&eventHandler);
+    pSampler->RemoveVoiceCountListener(&eventHandler);
+    pSampler->RemoveStreamCountListener(&eventHandler);
+    pSampler->RemoveBufferFillListener(&eventHandler);
+    pSampler->RemoveTotalStreamCountListener(&eventHandler);
+    pSampler->RemoveTotalVoiceCountListener(&eventHandler);
+    pSampler->RemoveFxSendCountListener(&eventHandler);
+    MidiInstrumentMapper::RemoveMidiInstrumentCountListener(&eventHandler);
+    MidiInstrumentMapper::RemoveMidiInstrumentInfoListener(&eventHandler);
+    MidiInstrumentMapper::RemoveMidiInstrumentMapCountListener(&eventHandler);
+    MidiInstrumentMapper::RemoveMidiInstrumentMapInfoListener(&eventHandler);
+#if HAVE_SQLITE3
+    InstrumentsDb::GetInstrumentsDb()->RemoveInstrumentsDbListener(&dbInstrumentsEventHandler);
+#endif
+}
 
 /**
  * Blocks the calling thread until the LSCP Server is initialized and
@@ -507,7 +526,7 @@
 
         int retval = select(maxSessions+1, &selectSet, NULL, NULL, &timeout);
 
-	if (retval == 0)
+	if (retval == 0 || (retval == -1 && errno == EINTR))
 		continue; //Nothing try again
 	if (retval == -1) {
 		std::cerr << "LSCPServer: Socket select error." << std::endl;
@@ -1259,6 +1278,7 @@
             for (;iter != parameters.end(); iter++) {
                 if (s != "") s += ",";
                 s += iter->first;
+                delete iter->second;
             }
             result.Add("PARAMETERS", s);
         }
@@ -1283,6 +1303,7 @@
             for (;iter != parameters.end(); iter++) {
                 if (s != "") s += ",";
                 s += iter->first;
+                delete iter->second;
             }
             result.Add("PARAMETERS", s);
         }
@@ -1313,6 +1334,7 @@
         if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
         if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
         if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
+        delete pParameter;
     }
     catch (Exception e) {
         result.Error(e);
@@ -1340,6 +1362,7 @@
         if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
         if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
         if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
+        delete pParameter;
     }
     catch (Exception e) {
         result.Error(e);
@@ -2540,7 +2563,79 @@
 String LSCPServer::GetTotalVoiceCountMax() {
     dmsg(2,("LSCPServer: GetTotalVoiceCountMax()\n"));
     LSCPResultSet result;
-    result.Add(EngineFactory::EngineInstances().size() * CONFIG_MAX_VOICES);
+    result.Add(EngineFactory::EngineInstances().size() * GLOBAL_MAX_VOICES);
+    return result.Produce();
+}
+
+/**
+ * Will be called by the parser to return the sampler global maximum
+ * allowed number of voices.
+ */
+String LSCPServer::GetGlobalMaxVoices() {
+    dmsg(2,("LSCPServer: GetGlobalMaxVoices()\n"));
+    LSCPResultSet result;
+    result.Add(GLOBAL_MAX_VOICES);
+    return result.Produce();
+}
+
+/**
+ * Will be called by the parser to set the sampler global maximum number of
+ * voices.
+ */
+String LSCPServer::SetGlobalMaxVoices(int iVoices) {
+    dmsg(2,("LSCPServer: SetGlobalMaxVoices(%d)\n", iVoices));
+    LSCPResultSet result;
+    try {
+        if (iVoices < 1) throw Exception("Maximum voices may not be less than 1");
+        GLOBAL_MAX_VOICES = iVoices; // see common/global_private.cpp
+        const std::set<Engine*>& engines = EngineFactory::EngineInstances();
+        if (engines.size() > 0) {
+            std::set<Engine*>::iterator iter = engines.begin();
+            std::set<Engine*>::iterator end  = engines.end();
+            for (; iter != end; ++iter) {
+                (*iter)->SetMaxVoices(iVoices);
+            }
+        }
+        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "VOICES", GLOBAL_MAX_VOICES));
+    } catch (Exception e) {
+        result.Error(e);
+    }
+    return result.Produce();
+}
+
+/**
+ * Will be called by the parser to return the sampler global maximum
+ * allowed number of disk streams.
+ */
+String LSCPServer::GetGlobalMaxStreams() {
+    dmsg(2,("LSCPServer: GetGlobalMaxStreams()\n"));
+    LSCPResultSet result;
+    result.Add(GLOBAL_MAX_STREAMS);
+    return result.Produce();
+}
+
+/**
+ * Will be called by the parser to set the sampler global maximum number of
+ * disk streams.
+ */
+String LSCPServer::SetGlobalMaxStreams(int iStreams) {
+    dmsg(2,("LSCPServer: SetGlobalMaxStreams(%d)\n", iStreams));
+    LSCPResultSet result;
+    try {
+        if (iStreams < 0) throw Exception("Maximum disk streams may not be negative");
+        GLOBAL_MAX_STREAMS = iStreams; // see common/global_private.cpp
+        const std::set<Engine*>& engines = EngineFactory::EngineInstances();
+        if (engines.size() > 0) {
+            std::set<Engine*>::iterator iter = engines.begin();
+            std::set<Engine*>::iterator end  = engines.end();
+            for (; iter != end; ++iter) {
+                (*iter)->SetMaxDiskStreams(iStreams);
+            }
+        }
+        LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_global_info, "STREAMS", GLOBAL_MAX_STREAMS));
+    } catch (Exception e) {
+        result.Error(e);
+    }
     return result.Produce();
 }
 
@@ -2728,17 +2823,9 @@
         throw Exception("Directory is specified");
     }
     #else
-    struct stat statBuf;
-    int res = stat(Filename.c_str(), &statBuf);
-    if (res) {
-        std::stringstream ss;
-        ss << "Fail to stat `" << Filename << "`: " << strerror(errno);
-        throw Exception(ss.str());
-    }
-
-    if (S_ISDIR(statBuf.st_mode)) {
-        throw Exception("Directory is specified");
-    }
+    File f(Filename);
+    if(!f.Exist()) throw Exception(f.GetErrorMsg());
+    if (f.IsDirectory()) throw Exception("Directory is specified");
     #endif
 }
 
@@ -2933,19 +3020,19 @@
     return result.Produce();
 }
 
-String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground) {
-    dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground));
+String LSCPServer::AddDbInstruments(String ScanMode, String DbDir, String FsDir, bool bBackground, bool insDir) {
+    dmsg(2,("LSCPServer: AddDbInstruments(ScanMode=%s,DbDir=%s,FsDir=%s,bBackground=%d,insDir=%d)\n", ScanMode.c_str(), DbDir.c_str(), FsDir.c_str(), bBackground, insDir));
     LSCPResultSet result;
 #if HAVE_SQLITE3
     try {
         int id;
         InstrumentsDb* db = InstrumentsDb::GetInstrumentsDb();
         if (ScanMode.compare("RECURSIVE") == 0) {
-           id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground);
+            id = db->AddInstruments(RECURSIVE, DbDir, FsDir, bBackground, insDir);
         } else if (ScanMode.compare("NON_RECURSIVE") == 0) {
-           id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground);
+            id = db->AddInstruments(NON_RECURSIVE, DbDir, FsDir, bBackground, insDir);
         } else if (ScanMode.compare("FLAT") == 0) {
-           id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground);
+            id = db->AddInstruments(FLAT, DbDir, FsDir, bBackground, insDir);
         } else {
             throw Exception("Unknown scan mode: " + ScanMode);
         }