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

Diff of /linuxsampler/trunk/src/engines/sfz/sfz.h

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

revision 2114 by persson, Tue Aug 10 12:05:19 2010 UTC revision 2175 by persson, Mon Apr 25 08:12:36 2011 UTC
# Line 3  Line 3 
3   *   LinuxSampler - modular, streaming capable sampler                     *   *   LinuxSampler - modular, streaming capable sampler                     *
4   *                                                                         *   *                                                                         *
5   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *   *   Copyright (C) 2008 Anders Dahnielson <anders@dahnielson.com>          *
6   *   Copyright (C) 2009 - 2010 Anders Dahnielson and Grigor Iliev          *   *   Copyright (C) 2009 - 2011 Anders Dahnielson and Grigor Iliev          *
7   *                                                                         *   *                                                                         *
8   *   This program is free software; you can redistribute it and/or modify  *   *   This program is free software; you can redistribute it and/or modify  *
9   *   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 58  namespace sfz Line 58  namespace sfz
58      // Enumerations      // Enumerations
59      enum sw_vel_t    { VEL_CURRENT, VEL_PREVIOUS };      enum sw_vel_t    { VEL_CURRENT, VEL_PREVIOUS };
60      enum off_mode_t  { OFF_FAST, OFF_NORMAL };      enum off_mode_t  { OFF_FAST, OFF_NORMAL };
61      enum loop_mode_t { NO_LOOP, ONE_SHOT, LOOP_CONTINUOUS, LOOP_SUSTAIN };      enum loop_mode_t { NO_LOOP, ONE_SHOT, LOOP_CONTINUOUS, LOOP_SUSTAIN, LOOP_UNSET };
62      enum curve_t     { GAIN, POWER };      enum curve_t     { GAIN, POWER };
63      enum filter_t    { LPF_1P, HPF_1P, BPF_1P, BRF_1P, APF_1P,      enum filter_t    { LPF_1P, HPF_1P, BPF_1P, BRF_1P, APF_1P,
64                         LPF_2P, HPF_2P, BPF_2P, BRF_2P, PKF_2P,                         LPF_2P, HPF_2P, BPF_2P, BRF_2P, PKF_2P,
# Line 367  namespace sfz Line 367  namespace sfz
367          filter_t fil_type; filter_t fil2_type;          filter_t fil_type; filter_t fil2_type;
368          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
369          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;
370            int cutoff_cc; // TODO: this is just a temporary fix to avoid
371                           // looping through the cutoff_oncc array
372          Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;          Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;
373          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;
374          Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;          Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;
# Line 408  namespace sfz Line 410  namespace sfz
410      class Query {      class Query {
411      public:      public:
412          uint8_t chan;        // MIDI channel          uint8_t chan;        // MIDI channel
413          uint8_t key;         // MIDI note      TODO: or controller          uint8_t key;         // MIDI note
414          uint8_t vel;         // MIDI velocity          uint8_t vel;         // MIDI velocity
415          int bend;            // MIDI pitch bend          int bend;            // MIDI pitch bend
416          uint8_t bpm;         // host BPM          uint8_t bpm;         // host BPM
# Line 424  namespace sfz Line 426  namespace sfz
426          uint8_t prev_sw_key; // previous note value          uint8_t prev_sw_key; // previous note value
427    
428          void search(const Instrument* pInstrument);          void search(const Instrument* pInstrument);
429            void search(const Instrument* pInstrument, int triggercc);
430          Region* next();          Region* next();
431      private:      private:
432          LinuxSampler::ArrayList<Region*>* pRegionList;          LinuxSampler::ArrayList<Region*>* pRegionList;
# Line 458  namespace sfz Line 461  namespace sfz
461          /// assumed to come from a search in the lookup table.          /// assumed to come from a search in the lookup table.
462          bool OnKey(const Query& q);          bool OnKey(const Query& q);
463    
         /// Return true if region is triggered by control change  
         bool OnControl(uint8_t chan, uint8_t cont, uint8_t val,  
                    int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft,  
                    uint8_t prog, float rand, trigger_t trig, uint8_t* cc,  
                    float timer, bool* sw, uint8_t last_sw_key, uint8_t prev_sw_key);  
   
464          /// Return an articulation for the current state          /// Return an articulation for the current state
465          Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc);          Articulation* GetArticulation(int bend, uint8_t bpm, uint8_t chanaft, uint8_t polyaft, uint8_t* cc);
466    
# Line 504  namespace sfz Line 501  namespace sfz
501          std::vector<bool> KeySwitchBindings;          std::vector<bool> KeySwitchBindings;
502          SampleManager* pSampleManager;          SampleManager* pSampleManager;
503          LookupTable* pLookupTable;          LookupTable* pLookupTable;
504            LookupTable* pLookupTableCC[128];
505      };      };
506    
507      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////

Legend:
Removed from v.2114  
changed lines
  Added in v.2175

  ViewVC Help
Powered by ViewVC