/[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 1825 by iliev, Fri Aug 29 15:42:06 2008 UTC revision 1826 by iliev, Sat Jan 24 14:32:35 2009 UTC
# Line 21  Line 21 
21  #include "InstrumentManagerThread.h"  #include "InstrumentManagerThread.h"
22    
23  #include "../common/global_private.h"  #include "../common/global_private.h"
24    #include "EngineChannelFactory.h"
25    
26  namespace LinuxSampler {  namespace LinuxSampler {
27    
# Line 114  namespace LinuxSampler { Line 115  namespace LinuxSampler {
115                  try {                  try {
116                      switch (cmd.type) {                      switch (cmd.type) {
117                          case command_t::DIRECT_LOAD:                          case command_t::DIRECT_LOAD:
118                                EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, false);
119                              cmd.pEngineChannel->LoadInstrument();                              cmd.pEngineChannel->LoadInstrument();
120                                EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, true);
121                              break;                              break;
122                          case command_t::INSTR_MODE:                          case command_t::INSTR_MODE:
123                              cmd.pManager->SetMode(cmd.instrumentId, cmd.mode);                              cmd.pManager->SetMode(cmd.instrumentId, cmd.mode);
# Line 124  namespace LinuxSampler { Line 127  namespace LinuxSampler {
127                      }                      }
128                  } catch (Exception e) {                  } catch (Exception e) {
129                      e.PrintMessage();                      e.PrintMessage();
130                        if (cmd.type == command_t::DIRECT_LOAD) {
131                            EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, true);
132                        }
133                  } catch (...) {                  } catch (...) {
134                      std::cerr << "InstrumentManagerThread: some exception occured, could not finish task\n" << std::flush;                      std::cerr << "InstrumentManagerThread: some exception occured, could not finish task\n" << std::flush;
135                        if (cmd.type == command_t::DIRECT_LOAD) {
136                            EngineChannelFactory::SetDeleteEnabled(cmd.pEngineChannel, true);
137                        }
138                  }                  }
139              }              }
140    
Legend:
Removed from v.1825  
changed lines
  Added in v.1826
  ViewVC Help
Powered by ViewVC