--- linuxsampler/trunk/src/network/lscpserver.cpp	2004/08/22 14:46:47	225
+++ linuxsampler/trunk/src/network/lscpserver.cpp	2004/10/09 00:46:18	274
@@ -88,10 +88,19 @@
     SocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
 
     if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
-        std::cerr << "LSCPServer: Could not bind server socket." << std::endl;
-        close(hSocket);
-        //return -1;
-        exit(EXIT_FAILURE);
+        std::cerr << "LSCPServer: Could not bind server socket, retrying for " << ToString(LSCP_SERVER_BIND_TIMEOUT) << " seconds...";
+        for (int trial = 0; true; trial++) { // retry for LSCP_SERVER_BIND_TIMEOUT seconds
+            if (bind(hSocket, (sockaddr*) &SocketAddress, sizeof(sockaddr_in)) < 0) {
+                if (trial > LSCP_SERVER_BIND_TIMEOUT) {
+                    std::cerr << "gave up!" << std::endl;
+                    close(hSocket);
+                    //return -1;
+                    exit(EXIT_FAILURE);
+                }
+                else sleep(1); // sleep 1s
+            }
+            else break; // success
+        }
     }
 
     listen(hSocket, 1);
@@ -582,8 +591,8 @@
 
         result.Add("MIDI_INPUT_DEVICE", GetMidiInputDeviceIndex(pSamplerChannel->GetMidiInputDevice()));
         result.Add("MIDI_INPUT_PORT", pSamplerChannel->GetMidiInputPort());
-        if (pSamplerChannel->GetMidiInputChannel()) result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
-        else                                        result.Add("MIDI_INPUT_CHANNEL", "ALL");
+        if (pSamplerChannel->GetMidiInputChannel() == MidiInputPort::midi_chan_all) result.Add("MIDI_INPUT_CHANNEL", "ALL");
+        else result.Add("MIDI_INPUT_CHANNEL", pSamplerChannel->GetMidiInputChannel());
 
         result.Add("INSTRUMENT_FILE", InstrumentFileName);
         result.Add("INSTRUMENT_NR", InstrumentIndex);
@@ -743,7 +752,7 @@
 }
 
 String LSCPServer::GetMidiInputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
-    dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
+    dmsg(2,("LSCPServer: GetMidiInputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
     LSCPResultSet result;
     try {
         DeviceCreationParameter* pParameter = MidiInputDeviceFactory::GetDriverParameter(Driver, Parameter);
@@ -752,11 +761,16 @@
         result.Add("MANDATORY",    pParameter->Mandatory());
         result.Add("FIX",          pParameter->Fix());
         result.Add("MULTIPLICITY", pParameter->Multiplicity());
-        if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
-        if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
-        if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
-        if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
-        if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
+        optional<String> oDepends       = pParameter->Depends();
+        optional<String> oDefault       = pParameter->Default(DependencyList);
+        optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
+        optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
+        optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
+        if (oDepends)       result.Add("DEPENDS",       *oDepends);
+        if (oDefault)       result.Add("DEFAULT",       *oDefault);
+        if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
+        if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
+        if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
     }
     catch (LinuxSamplerException e) {
         result.Error(e);
@@ -765,7 +779,7 @@
 }
 
 String LSCPServer::GetAudioOutputDriverParameterInfo(String Driver, String Parameter, std::map<String,String> DependencyList) {
-    dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s)\n",Driver.c_str(),Parameter.c_str()));
+    dmsg(2,("LSCPServer: GetAudioOutputDriverParameterInfo(Driver=%s,Parameter=%s,DependencyListSize=%d)\n",Driver.c_str(),Parameter.c_str(),DependencyList.size()));
     LSCPResultSet result;
     try {
         DeviceCreationParameter* pParameter = AudioOutputDeviceFactory::GetDriverParameter(Driver, Parameter);
@@ -774,11 +788,16 @@
         result.Add("MANDATORY",    pParameter->Mandatory());
         result.Add("FIX",          pParameter->Fix());
         result.Add("MULTIPLICITY", pParameter->Multiplicity());
-        if (pParameter->Depends())       result.Add("DEPENDS",       *pParameter->Depends());
-        if (pParameter->Default())       result.Add("DEFAULT",       *pParameter->Default());
-        if (pParameter->RangeMin())      result.Add("RANGE_MIN",     *pParameter->RangeMin());
-        if (pParameter->RangeMax())      result.Add("RANGE_MAX",     *pParameter->RangeMax());
-        if (pParameter->Possibilities()) result.Add("POSSIBILITIES", *pParameter->Possibilities());
+        optional<String> oDepends       = pParameter->Depends();
+        optional<String> oDefault       = pParameter->Default(DependencyList);
+        optional<String> oRangeMin      = pParameter->RangeMin(DependencyList);
+        optional<String> oRangeMax      = pParameter->RangeMax(DependencyList);
+        optional<String> oPossibilities = pParameter->Possibilities(DependencyList);
+        if (oDepends)       result.Add("DEPENDS",       *oDepends);
+        if (oDefault)       result.Add("DEFAULT",       *oDefault);
+        if (oRangeMin)      result.Add("RANGE_MIN",     *oRangeMin);
+        if (oRangeMax)      result.Add("RANGE_MAX",     *oRangeMax);
+        if (oPossibilities) result.Add("POSSIBILITIES", *oPossibilities);
     }
     catch (LinuxSamplerException e) {
         result.Error(e);
@@ -1136,8 +1155,8 @@
         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
         // Driver type name aliasing...
-        if (AudioOutputDriver == "ALSA") AudioOutputDriver = "Alsa";
-        if (AudioOutputDriver == "JACK") AudioOutputDriver = "Jack";
+        if (AudioOutputDriver == "Alsa") AudioOutputDriver = "ALSA";
+        if (AudioOutputDriver == "Jack") AudioOutputDriver = "JACK";
         // Check if there's one audio output device already created
         // for the intended audio driver type (AudioOutputDriver)...
         AudioOutputDevice *pDevice = NULL;
@@ -1218,7 +1237,7 @@
         SamplerChannel* pSamplerChannel = pSampler->GetSamplerChannel(uiSamplerChannel);
         if (!pSamplerChannel) throw LinuxSamplerException("Invalid channel number " + ToString(uiSamplerChannel));
         // Driver type name aliasing...
-        if (MidiInputDriver == "ALSA") MidiInputDriver = "Alsa";
+        if (MidiInputDriver == "Alsa") MidiInputDriver = "ALSA";
         // Check if there's one MIDI input device already created
         // for the intended MIDI driver type (MidiInputDriver)...
         MidiInputDevice *pDevice = NULL;