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

Diff of /linuxsampler/trunk/src/engines/gig/EngineChannel.cpp

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

revision 1211 by iliev, Sun Mar 25 18:59:14 2007 UTC revision 1212 by schoenebeck, Tue May 29 23:59:36 2007 UTC
# Line 159  namespace LinuxSampler { namespace gig { Line 159  namespace LinuxSampler { namespace gig {
159       * This method will then actually start to load the instrument and block       * This method will then actually start to load the instrument and block
160       * the calling thread until loading was completed.       * the calling thread until loading was completed.
161       *       *
      * @returns detailed description of the method call result  
162       * @see PrepareLoadInstrument()       * @see PrepareLoadInstrument()
163       */       */
164      void EngineChannel::LoadInstrument() {      void EngineChannel::LoadInstrument() {
# Line 192  namespace LinuxSampler { namespace gig { Line 191  namespace LinuxSampler { namespace gig {
191              instrid.Index     = InstrumentIdx;              instrid.Index     = InstrumentIdx;
192              newInstrument = Engine::instruments.Borrow(instrid, this);              newInstrument = Engine::instruments.Borrow(instrid, this);
193              if (!newInstrument) {              if (!newInstrument) {
194                  throw InstrumentResourceManagerException("resource was not created");                  throw InstrumentManagerException("resource was not created");
195              }              }
196          }          }
197          catch (RIFF::Exception e) {          catch (RIFF::Exception e) {
# Line 200  namespace LinuxSampler { namespace gig { Line 199  namespace LinuxSampler { namespace gig {
199              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message;              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message;
200              throw Exception(msg);              throw Exception(msg);
201          }          }
202          catch (InstrumentResourceManagerException e) {          catch (InstrumentManagerException e) {
203              InstrumentStat = -3;              InstrumentStat = -3;
204              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message();              String msg = "gig::Engine error: Failed to load instrument, cause: " + e.Message();
205              throw Exception(msg);              throw Exception(msg);

Legend:
Removed from v.1211  
changed lines
  Added in v.1212

  ViewVC Help
Powered by ViewVC