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

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

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

revision 2058 by persson, Sun Feb 14 11:40:49 2010 UTC revision 2114 by persson, Tue Aug 10 12:05:19 2010 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-2009 Christian Schoenebeck                         *   *   Copyright (C) 2005-2009 Christian Schoenebeck                         *
7   *   Copyright (C) 2009 Grigor Iliev                                       *   *   Copyright (C) 2009-2010 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 95  namespace LinuxSampler { namespace sfz { Line 95  namespace LinuxSampler { namespace sfz {
95          cmd.pRegionsInUse->clear();          cmd.pRegionsInUse->clear();
96    
97          // delete all key groups          // delete all key groups
98          ActiveKeyGroups.clear();          DeleteGroupEventLists();
99    
100          // request sfz instrument from instrument manager          // request sfz instrument from instrument manager
101          ::sfz::Instrument* newInstrument;          ::sfz::Instrument* newInstrument;
# Line 135  namespace LinuxSampler { namespace sfz { Line 135  namespace LinuxSampler { namespace sfz {
135          }          }
136    
137          // rebuild ActiveKeyGroups map with key groups of current instrument          // rebuild ActiveKeyGroups map with key groups of current instrument
138          //for (::gig::Region* pRegion = newInstrument->GetFirstRegion(); pRegion; pRegion = newInstrument->GetNextRegion())          for (std::vector< ::sfz::Region*>::iterator itRegion = newInstrument->regions.begin() ;
139          //    if (pRegion->KeyGroup) ActiveKeyGroups[pRegion->KeyGroup] = NULL;               itRegion != newInstrument->regions.end() ; ++itRegion) {
140          // TODO: ^^^              AddGroup((*itRegion)->group);
141                AddGroup((*itRegion)->off_by);
142            }
143    
144          InstrumentIdxName = newInstrument->GetName();          InstrumentIdxName = newInstrument->GetName();
145          InstrumentStat = 100;          InstrumentStat = 100;
Legend:
Removed from v.2058  
changed lines
  Added in v.2114
  ViewVC Help
Powered by ViewVC