--- linuxsampler/trunk/src/network/lscpserver.cpp	2006/06/27 22:57:37	880
+++ linuxsampler/trunk/src/network/lscpserver.cpp	2006/07/28 21:35:06	907
@@ -322,7 +322,7 @@
 				continue; //Ignore CR
 			if (c == '\n') {
 				LSCPServer::SendLSCPNotify(LSCPEvent(LSCPEvent::event_misc, "Received \'" + bufferedCommands[socket] + "\' on socket", socket));
-				bufferedCommands[socket] += "\n";
+				bufferedCommands[socket] += "\r\n";
 				return true; //Complete command was read
 			}
 			bufferedCommands[socket] += c;
@@ -588,7 +588,14 @@
  */
 String LSCPServer::GetAvailableEngines() {
     dmsg(2,("LSCPServer: GetAvailableEngines()\n"));
-    LSCPResultSet result("1");
+    LSCPResultSet result;
+    try {
+        int n = EngineFactory::AvailableEngineTypes().size();
+        result.Add(n);
+    }
+    catch (Exception e) {
+        result.Error(e);
+    }
     return result.Produce();
 }
 
@@ -597,7 +604,14 @@
  */
 String LSCPServer::ListAvailableEngines() {
     dmsg(2,("LSCPServer: ListAvailableEngines()\n"));
-    LSCPResultSet result("\'GIG\'");
+    LSCPResultSet result;
+    try {
+        String s = EngineFactory::AvailableEngineTypesAsString();
+        result.Add(s);
+    }
+    catch (Exception e) {
+        result.Error(e);
+    }
     return result.Produce();
 }