/[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 374 by schoenebeck, Sat Feb 12 00:36:08 2005 UTC revision 376 by senkov, Sat Feb 12 23:48:50 2005 UTC
# Line 579  String LSCPServer::GetChannelInfo(uint u Line 579  String LSCPServer::GetChannelInfo(uint u
579          String EngineName = "NONE";          String EngineName = "NONE";
580          float Volume = 0.0f;          float Volume = 0.0f;
581          String InstrumentFileName = "NONE";          String InstrumentFileName = "NONE";
582            String InstrumentName = "NONE";
583          int InstrumentIndex = -1;          int InstrumentIndex = -1;
584          int InstrumentStatus = -1;          int InstrumentStatus = -1;
585          int AudioOutputChannels = 0;          int AudioOutputChannels = 0;
# Line 591  String LSCPServer::GetChannelInfo(uint u Line 592  String LSCPServer::GetChannelInfo(uint u
592              InstrumentStatus = pEngine->InstrumentStatus();              InstrumentStatus = pEngine->InstrumentStatus();
593              InstrumentIndex = pEngine->InstrumentIndex();              InstrumentIndex = pEngine->InstrumentIndex();
594              if (InstrumentIndex != -1)              if (InstrumentIndex != -1)
595                {
596                  InstrumentFileName = pEngine->InstrumentFileName();                  InstrumentFileName = pEngine->InstrumentFileName();
597                    InstrumentName = pEngine->InstrumentName();
598                }
599              for (int chan = 0; chan < pEngine->Channels(); chan++) {              for (int chan = 0; chan < pEngine->Channels(); chan++) {
600                  if (AudioRouting != "") AudioRouting += ",";                  if (AudioRouting != "") AudioRouting += ",";
601                  AudioRouting += ToString(pEngine->OutputChannel(chan));                  AudioRouting += ToString(pEngine->OutputChannel(chan));
# Line 613  String LSCPServer::GetChannelInfo(uint u Line 617  String LSCPServer::GetChannelInfo(uint u
617    
618          result.Add("INSTRUMENT_FILE", InstrumentFileName);          result.Add("INSTRUMENT_FILE", InstrumentFileName);
619          result.Add("INSTRUMENT_NR", InstrumentIndex);          result.Add("INSTRUMENT_NR", InstrumentIndex);
620            result.Add("INSTRUMENT_NAME", InstrumentName);
621          result.Add("INSTRUMENT_STATUS", InstrumentStatus);          result.Add("INSTRUMENT_STATUS", InstrumentStatus);
622      }      }
623      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {

Legend:
Removed from v.374  
changed lines
  Added in v.376

  ViewVC Help
Powered by ViewVC