/[svn]/linuxsampler/trunk/src/network/lscpserver.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/network/lscpserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 527 by capela, Mon May 9 11:59:58 2005 UTC revision 579 by schoenebeck, Tue May 24 19:20:20 2005 UTC
# Line 62  Mutex LSCPServer::RTNotifyMutex = Mutex( Line 62  Mutex LSCPServer::RTNotifyMutex = Mutex(
62    
63  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(true, false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(true, false, 0, -4) {
64      this->pSampler = pSampler;      this->pSampler = pSampler;
65      LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_count, "CHANNEL_COUNT");
66      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
67      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_stream_count, "STREAM_COUNT");
68      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");      LSCPEvent::RegisterEvent(LSCPEvent::event_buffer_fill, "BUFFER_FILL");
69      LSCPEvent::RegisterEvent(LSCPEvent::event_info, "INFO");      LSCPEvent::RegisterEvent(LSCPEvent::event_channel_info, "CHANNEL_INFO");
70      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");      LSCPEvent::RegisterEvent(LSCPEvent::event_misc, "MISCELLANEOUS");
71      hSocket = -1;      hSocket = -1;
72  }  }
# Line 1391  String LSCPServer::ResetChannel(uint uiS Line 1391  String LSCPServer::ResetChannel(uint uiS
1391          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));          if (!pSamplerChannel) throw LinuxSamplerException("Invalid sampler channel number " + ToString(uiSamplerChannel));
1392          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();          EngineChannel* pEngineChannel = pSamplerChannel->GetEngineChannel();
1393          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");          if (!pEngineChannel) throw LinuxSamplerException("No engine type assigned to sampler channel");
1394            if (!pEngineChannel->GetEngine()) throw LinuxSamplerException("No audio output device connected to sampler channel");
1395          pEngineChannel->GetEngine()->Reset();          pEngineChannel->GetEngine()->Reset();
1396      }      }
1397      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
# Line 1409  String LSCPServer::ResetSampler() { Line 1410  String LSCPServer::ResetSampler() {
1410      return result.Produce();      return result.Produce();
1411  }  }
1412    
1413    /**
1414     * Will be called by the parser to return general informations about this
1415     * sampler.
1416     */
1417    String LSCPServer::GetServerInfo() {
1418        dmsg(2,("LSCPServer: GetServerInfo()\n"));
1419        LSCPResultSet result;
1420        result.Add("DESCRIPTION", "LinuxSampler - modular, streaming capable sampler");
1421        result.Add("VERSION", VERSION);
1422        result.Add("PROTOCOL_VERSION", "1.0");
1423        return result.Produce();
1424    }
1425    
1426  /**  /**
1427   * Will be called by the parser to subscribe a client (frontend) on the   * Will be called by the parser to subscribe a client (frontend) on the
1428   * server for receiving event messages.   * server for receiving event messages.

Legend:
Removed from v.527  
changed lines
  Added in v.579

  ViewVC Help
Powered by ViewVC