/[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 2329 by persson, Sat Oct 1 08:23:02 2011 UTC revision 2330 by schoenebeck, Mon Mar 12 15:14:31 2012 UTC
# Line 4  Line 4 
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *   *   Copyright (C) 2003,2004 by Benno Senoner and Christian Schoenebeck    *
6   *   Copyright (C) 2005-2008 Christian Schoenebeck                         *   *   Copyright (C) 2005-2008 Christian Schoenebeck                         *
7   *   Copyright (C) 2009-2011 Christian Schoenebeck and Grigor Iliev        *   *   Copyright (C) 2009-2012 Christian Schoenebeck and Grigor Iliev        *
8   *                                                                         *   *                                                                         *
9   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
10   *   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 157  namespace LinuxSampler { namespace gig { Line 157  namespace LinuxSampler { namespace gig {
157                      (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1);                      (pInstrument->DimensionKeyRange.high - pInstrument->DimensionKeyRange.low + 1);
158          }          }
159      }      }
160        
161        String EngineChannel::InstrumentFileName() {
162            return EngineChannelBase<Voice, ::gig::DimensionRegion, ::gig::Instrument>::InstrumentFileName();
163        }
164        
165        String EngineChannel::InstrumentFileName(int index) {
166            if (index == 0) return InstrumentFileName();
167            if (!pInstrument || !pInstrument->GetParent()) return "";
168            DLS::File* pMainFile = dynamic_cast<DLS::File*>(pInstrument->GetParent());
169            if (!pMainFile) return "";
170            RIFF::File* pExtensionFile = pMainFile->GetExtensionFile(index);
171            return (pExtensionFile) ? pExtensionFile->GetFileName() : "";
172        }
173    
174  }} // namespace LinuxSampler::gig  }} // namespace LinuxSampler::gig
Legend:
Removed from v.2329  
changed lines
  Added in v.2330
  ViewVC Help
Powered by ViewVC