/[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 385 by schoenebeck, Thu Feb 17 02:53:45 2005 UTC revision 392 by schoenebeck, Sat Feb 19 02:40:24 2005 UTC
# Line 53  Mutex LSCPServer::NotifyBufferMutex = Mu Line 53  Mutex LSCPServer::NotifyBufferMutex = Mu
53  Mutex LSCPServer::SubscriptionMutex = Mutex();  Mutex LSCPServer::SubscriptionMutex = Mutex();
54  Mutex LSCPServer::RTNotifyMutex = Mutex();  Mutex LSCPServer::RTNotifyMutex = Mutex();
55    
56  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(false, 0, -4) {  LSCPServer::LSCPServer(Sampler* pSampler) : Thread(true, false, 0, -4) {
57      this->pSampler = pSampler;      this->pSampler = pSampler;
58      LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");      LSCPEvent::RegisterEvent(LSCPEvent::event_channels, "CHANNELS");
59      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");      LSCPEvent::RegisterEvent(LSCPEvent::event_voice_count, "VOICE_COUNT");
# Line 454  String LSCPServer::LoadInstrument(String Line 454  String LSCPServer::LoadInstrument(String
454          if (bBackground) {          if (bBackground) {
455              InstrumentLoader.StartNewLoad(Filename, uiInstrument, pEngine);              InstrumentLoader.StartNewLoad(Filename, uiInstrument, pEngine);
456          }          }
457          else pEngine->LoadInstrument(Filename.c_str(), uiInstrument);          else {
458                // tell the engine which instrument to load
459                pEngine->PrepareLoadInstrument(Filename.c_str(), uiInstrument);
460                // actually start to load the instrument (blocks until completed)
461                pEngine->LoadInstrument();
462            }
463      }      }
464      catch (LinuxSamplerException e) {      catch (LinuxSamplerException e) {
465           result.Error(e);           result.Error(e);

Legend:
Removed from v.385  
changed lines
  Added in v.392

  ViewVC Help
Powered by ViewVC