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

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

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

revision 969 by schoenebeck, Wed Nov 29 19:48:38 2006 UTC revision 970 by schoenebeck, Wed Dec 6 22:28:17 2006 UTC
# Line 78  namespace LinuxSampler { namespace gig { Line 78  namespace LinuxSampler { namespace gig {
78      }      }
79    
80      String InstrumentResourceManager::GetInstrumentName(instrument_id_t ID) {      String InstrumentResourceManager::GetInstrumentName(instrument_id_t ID) {
81          ::gig::Instrument* pInstrument = Resource(ID);          Lock();
82          return (pInstrument) ? pInstrument->pInfo->Name : "";          ::gig::Instrument* pInstrument = Resource(ID, false);
83            String res = (pInstrument) ? pInstrument->pInfo->Name : "";
84            Unlock();
85            return res;
86      }      }
87    
88      ::gig::Instrument* InstrumentResourceManager::Create(instrument_id_t Key, InstrumentConsumer* pConsumer, void*& pArg) {      ::gig::Instrument* InstrumentResourceManager::Create(instrument_id_t Key, InstrumentConsumer* pConsumer, void*& pArg) {
Legend:
Removed from v.969  
changed lines
  Added in v.970
  ViewVC Help
Powered by ViewVC