/[svn]/linuxsampler/trunk/src/engines/InstrumentManagerThread.cpp
ViewVC logotype

Diff of /linuxsampler/trunk/src/engines/InstrumentManagerThread.cpp

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

revision 2187 by persson, Sun Jun 19 18:54:11 2011 UTC revision 2324 by persson, Sun Mar 4 09:01:32 2012 UTC
# Line 1  Line 1 
1  /***************************************************************************  /***************************************************************************
2   *                                                                         *   *                                                                         *
3   *   Copyright (C) 2005 - 2007 Christian Schoenebeck                       *   *   Copyright (C) 2005 - 2012 Christian Schoenebeck                       *
4   *                                                                         *   *                                                                         *
5   *   This library is free software; you can redistribute it and/or modify  *   *   This library is free software; you can redistribute it and/or modify  *
6   *   it under the terms of the GNU General Public License as published by  *   *   it under the terms of the GNU General Public License as published by  *
# Line 46  namespace LinuxSampler { Line 46  namespace LinuxSampler {
46      void InstrumentManagerThread::StartNewLoad(String Filename, uint uiInstrumentIndex, EngineChannel* pEngineChannel) {      void InstrumentManagerThread::StartNewLoad(String Filename, uint uiInstrumentIndex, EngineChannel* pEngineChannel) {
47          dmsg(1,("Scheduling '%s' (Index=%d) to be loaded in background (if not loaded yet).\n",Filename.c_str(),uiInstrumentIndex));          dmsg(1,("Scheduling '%s' (Index=%d) to be loaded in background (if not loaded yet).\n",Filename.c_str(),uiInstrumentIndex));
48    
49          static bool listenerRegistered = false;          // the listener only needs to be registered once in the
50          if (!listenerRegistered) {          // Sampler, but as we don't know if Sampler has been
51              pEngineChannel->GetSampler()->AddChannelCountListener(&eventHandler);          // recreated, we simply remove and add every time
52              listenerRegistered = true;          pEngineChannel->GetSampler()->RemoveChannelCountListener(&eventHandler);
53          }          pEngineChannel->GetSampler()->AddChannelCountListener(&eventHandler);
           
54                    
         // already tell the engine which instrument to load  
         pEngineChannel->PrepareLoadInstrument(Filename.c_str(), uiInstrumentIndex);  
   
55          command_t cmd;          command_t cmd;
56          cmd.type           = command_t::DIRECT_LOAD;          cmd.type           = command_t::DIRECT_LOAD;
57          cmd.pEngineChannel = pEngineChannel;          cmd.pEngineChannel = pEngineChannel;
58            cmd.instrumentId.Index = uiInstrumentIndex;
59            cmd.instrumentId.FileName = Filename;
60    
61          mutex.Lock();          mutex.Lock();
62          queue.push_back(cmd);          queue.push_back(cmd);
# Line 103  namespace LinuxSampler { Line 101  namespace LinuxSampler {
101              TestCancel();              TestCancel();
102              #endif              #endif
103    
104              while (!queue.empty()) {              while (true) {
105                  command_t cmd;                  command_t cmd;
106    
107                  // grab a new command from the queue                  // grab a new command from the queue
108                  mutex.Lock();                  mutex.Lock();
109                  cmd = queue.front();                  bool empty = queue.empty();
110                  queue.pop_front();                  if (!empty) {
111                        cmd = queue.front();
112                        queue.pop_front();
113                    }
114                  mutex.Unlock();                  mutex.Unlock();
115                    if (empty) break;
116    
117                  try {                  try {
118                      switch (cmd.type) {                      switch (cmd.type) {
119                          case command_t::DIRECT_LOAD:                          case command_t::DIRECT_LOAD:
120                              EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, false);                              EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, false);
121                                cmd.pEngineChannel->PrepareLoadInstrument(cmd.instrumentId.FileName.c_str(), cmd.instrumentId.Index);
122                              cmd.pEngineChannel->LoadInstrument();                              cmd.pEngineChannel->LoadInstrument();
123                              EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, true);                              EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, true);
124                              break;                              break;
# Line 178  namespace LinuxSampler { Line 181  namespace LinuxSampler {
181      }      }
182  #endif  #endif
183    
184    #ifdef WIN32
185        int InstrumentManagerThread::StopThread() {
186            int res = Thread::StopThread();
187            conditionJobsLeft.Reset();
188            return res;
189        }
190    #endif
191    
192  } // namespace LinuxSampler  } // namespace LinuxSampler

Legend:
Removed from v.2187  
changed lines
  Added in v.2324

  ViewVC Help
Powered by ViewVC