/[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 2233 by iliev, Mon Aug 8 18:46:19 2011 UTC revision 2252 by iliev, Sat Aug 20 14:01:36 2011 UTC
# Line 48  namespace sfz Line 48  namespace sfz
48      class Instrument;      class Instrument;
49      class File;      class File;
50      class LookupTable;      class LookupTable;
51        class SampleManager;
52    
53      class Sample : public LinuxSampler::SampleFileBase<Region> {      class Sample : public LinuxSampler::SampleFileBase<Region> {
54            private:
55                int  End;
56                long TotalFrames;
57                
58          public:          public:
59              Sample(String File, bool DontClose = false, uint offset = 0): LinuxSampler::SampleFileBase<Region>(File, DontClose) {              Sample(String File, bool DontClose = false, uint offset = 0, int end = -2 /* -2 means unspecified */)
60                      : LinuxSampler::SampleFileBase<Region>(File, DontClose)
61                {
62                  Offset = offset;                  Offset = offset;
63                    End = end;
64                    
65                    long tfc = LinuxSampler::SampleFileBase<Region>::GetTotalFrameCount();
66                    if (Offset >= tfc) {
67                        std::cerr << "Offset for file '" << this->GetFile() << "' too long (" << Offset << ")" << std::endl;
68                        Offset = 0;
69                    }
70                    
71                    if (End == -2 || End > tfc) TotalFrames = tfc;
72                    else if (End == -1 || End < Offset) TotalFrames = 0;
73                    else TotalFrames = End;
74              }              }
75              virtual ~Sample() { }              virtual ~Sample() { }
76                
77                virtual long GetTotalFrameCount() { return TotalFrames; }
78                
79                friend class SampleManager;
80      };      };
81    
82      // Enumerations      // Enumerations
# Line 72  namespace sfz Line 94  namespace sfz
94    
95      class SampleManager : public LinuxSampler::SampleManager<Sample, Region> {      class SampleManager : public LinuxSampler::SampleManager<Sample, Region> {
96      public:      public:
97          Sample* FindSample(std::string samplePath, int offset);          Sample* FindSample(std::string samplePath, uint offset, int end);
98    
99      protected:      protected:
100          virtual void OnSampleInUse(Sample* pSample) {          virtual void OnSampleInUse(Sample* pSample) {
# Line 267  namespace sfz Line 289  namespace sfz
289          int loop;          int loop;
290          int loop_count;          int loop_count;
291          float amplitude;          float amplitude;
292            float volume;
293          float cutoff;          float cutoff;
294            int   pitch; // -9600 to 9600 cents
295            float resonance; // 0 to 40 dB
296            float pan; // -100 to 100 %
297            int   pan_curve;
298            
299            LinuxSampler::ArrayList<CC> amplitude_oncc;
300            LinuxSampler::ArrayList<CC> volume_oncc;
301            LinuxSampler::ArrayList<CC> cutoff_oncc; // -9600 to 9600 cents
302            LinuxSampler::ArrayList<CC> pitch_oncc;
303            LinuxSampler::ArrayList<CC> resonance_oncc; // 0 to 40 dB
304            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
305            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
306            
307          EG();          EG();
308          EG(const EG& eg) { Copy(eg); }          EG(const EG& eg) { Copy(eg); }
309          void operator=(const EG& eg) { Copy(eg); }          void operator=(const EG& eg) { Copy(eg); }
# Line 405  namespace sfz Line 441  namespace sfz
441          optional<int> delay_samples; Array<optional<int> > delay_samples_oncc;          optional<int> delay_samples; Array<optional<int> > delay_samples_oncc;
442          optional<int> end;          optional<int> end;
443          optional<float> loop_crossfade;          optional<float> loop_crossfade;
444          optional<int> offset; optional<int> offset_random; Array<optional<int> > offset_oncc;          optional<uint> offset; optional<int> offset_random; Array<optional<int> > offset_oncc;
445          loop_mode_t loop_mode;          loop_mode_t loop_mode;
446          optional<int> loop_start; optional<int> loop_end;          optional<int> loop_start; optional<int> loop_end;
447          optional<int> sync_beats;          optional<int> sync_beats;
# Line 438  namespace sfz Line 474  namespace sfz
474          // filter          // filter
475          filter_t fil_type; filter_t fil2_type;          filter_t fil_type; filter_t fil2_type;
476          optional<float> cutoff; optional<float> cutoff2;          optional<float> cutoff; optional<float> cutoff2;
477          Array<int> cutoff_oncc; Array<int> cutoff2_oncc;          LinuxSampler::ArrayList<CC> cutoff_oncc, cutoff2_oncc;
478          int cutoff_cc; // TODO: this is just a temporary fix to avoid          LinuxSampler::ArrayList<CC> cutoff_smoothcc, cutoff2_smoothcc;
                        // looping through the cutoff_oncc array  
         Array<int> cutoff_smoothcc; Array<int> cutoff2_smoothcc;  
479          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;          Array<int> cutoff_stepcc; Array<int> cutoff2_stepcc;
480          Array<int> cutoff_curvecc; Array<int> cutoff2_curvecc;          LinuxSampler::ArrayList<CC> cutoff_curvecc, cutoff2_curvecc;
481          int cutoff_chanaft; int cutoff2_chanaft;          int cutoff_chanaft; int cutoff2_chanaft;
482          int cutoff_polyaft; int cutoff2_polyaft;          int cutoff_polyaft; int cutoff2_polyaft;
483          float resonance; float resonance2;          float resonance; float resonance2;
484          Array<int> resonance_oncc; Array<int> resonance2_oncc;          LinuxSampler::ArrayList<CC> resonance_oncc, resonance2_oncc;
485          Array<int> resonance_smoothcc; Array<int> resonance2_smoothcc;          LinuxSampler::ArrayList<CC> resonance_smoothcc, resonance2_smoothcc;
486          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;          Array<int> resonance_stepcc; Array<int> resonance2_stepcc;
487          Array<int> resonance_curvecc; Array<int> resonance2_curvecc;          LinuxSampler::ArrayList<CC> resonance_curvecc, resonance2_curvecc;
488          int fil_keytrack; int fil2_keytrack;          int fil_keytrack; int fil2_keytrack;
489          int fil_keycenter; int fil2_keycenter;          int fil_keycenter; int fil2_keycenter;
490          int fil_veltrack; int fil2_veltrack;          int fil_veltrack; int fil2_veltrack;
# Line 473  namespace sfz Line 507  namespace sfz
507          LinuxSampler::ArrayList<CC> ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc;          LinuxSampler::ArrayList<CC> ampeg_decaycc, ampeg_sustaincc, ampeg_releasecc;
508          float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;          float fileg_delay, fileg_start, fileg_attack, fileg_hold, fileg_decay, fileg_sustain, fileg_release;
509          float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;          float fileg_vel2delay, fileg_vel2attack, fileg_vel2hold, fileg_vel2decay, fileg_vel2sustain, fileg_vel2release;
510            LinuxSampler::ArrayList<CC> fileg_delay_oncc, fileg_start_oncc, fileg_attack_oncc, fileg_hold_oncc;
511            LinuxSampler::ArrayList<CC> fileg_decay_oncc, fileg_sustain_oncc, fileg_release_oncc, fileg_depth_oncc;
512          float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;          float pitcheg_delay, pitcheg_start, pitcheg_attack, pitcheg_hold, pitcheg_decay, pitcheg_sustain, pitcheg_release;
513          float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;          float pitcheg_vel2delay, pitcheg_vel2attack, pitcheg_vel2hold, pitcheg_vel2decay, pitcheg_vel2sustain, pitcheg_vel2release;
514          int   fileg_depth, pitcheg_depth;          int   fileg_depth, pitcheg_depth;
515            LinuxSampler::ArrayList<CC> pitcheg_delay_oncc, pitcheg_start_oncc, pitcheg_attack_oncc, pitcheg_hold_oncc;
516            LinuxSampler::ArrayList<CC> pitcheg_decay_oncc, pitcheg_sustain_oncc, pitcheg_release_oncc, pitcheg_depth_oncc;
517          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;          float amplfo_delay, amplfo_fade, amplfo_freq, amplfo_depth;
518          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;          float fillfo_delay, fillfo_fade, fillfo_freq, fillfo_depth;
519          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;          float pitchlfo_delay, pitchlfo_fade, pitchlfo_freq;
520          int pitchlfo_depth;          int pitchlfo_depth;
521          Array<int> pitchlfo_depthcc;          Array<int> pitchlfo_depthcc;
522                    
523            LinuxSampler::ArrayList<CC> pitchlfo_delay_oncc; // 0 to 100 seconds
524            LinuxSampler::ArrayList<CC> pitchlfo_fade_oncc; // 0 to 100 seconds
525          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz          LinuxSampler::ArrayList<CC> pitchlfo_freqcc; // 0 to 20 Hz
526            LinuxSampler::ArrayList<CC> fillfo_delay_oncc; // 0 to 100 seconds
527            LinuxSampler::ArrayList<CC> fillfo_fade_oncc; // 0 to 100 seconds
528          LinuxSampler::ArrayList<CC> fillfo_depthcc;  // -1200 to 1200 cents          LinuxSampler::ArrayList<CC> fillfo_depthcc;  // -1200 to 1200 cents
529          LinuxSampler::ArrayList<CC> fillfo_freqcc;   // 0 to 20 Hz          LinuxSampler::ArrayList<CC> fillfo_freqcc;   // 0 to 20 Hz
530            LinuxSampler::ArrayList<CC> amplfo_delay_oncc; // 0 to 100 seconds
531            LinuxSampler::ArrayList<CC> amplfo_fade_oncc; // 0 to 100 seconds
532          LinuxSampler::ArrayList<CC> amplfo_depthcc;  // -10 to 10 dB          LinuxSampler::ArrayList<CC> amplfo_depthcc;  // -10 to 10 dB
533          LinuxSampler::ArrayList<CC> amplfo_freqcc;   // 0 to 20 Hz          LinuxSampler::ArrayList<CC> amplfo_freqcc;   // 0 to 20 Hz
534    
# Line 497  namespace sfz Line 541  namespace sfz
541          LinuxSampler::ArrayList<CC> volume_oncc;          LinuxSampler::ArrayList<CC> volume_oncc;
542          LinuxSampler::ArrayList<CC> volume_curvecc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc          LinuxSampler::ArrayList<CC> volume_curvecc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
543          LinuxSampler::ArrayList<CC> volume_smoothcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc          LinuxSampler::ArrayList<CC> volume_smoothcc; // used only as temporary buffer during the parsing - values are then moved to volume_oncc
544            
545            LinuxSampler::ArrayList<CC> pan_oncc; // -100 to 100 %
546            LinuxSampler::ArrayList<CC> pan_curvecc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
547            LinuxSampler::ArrayList<CC> pan_smoothcc; // used only as temporary buffer during the parsing - values are then moved to pan_oncc
548      };      };
549    
550      class Query {      class Query {
# Line 576  namespace sfz Line 624  namespace sfz
624      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
625      // class Instrument      // class Instrument
626    
627      /// Provides all neccessary information for the synthesis of an Instrument      /// Provides all necessary information for the synthesis of an Instrument
628      class Instrument : public SampleManager      class Instrument : public SampleManager
629      {      {
630      public:      public:
# Line 651  namespace sfz Line 699  namespace sfz
699          LFO& lfo(int x);          LFO& lfo(int x);
700          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);          void copyCurves(LinuxSampler::ArrayList<CC>& curves, LinuxSampler::ArrayList<CC>& dest);
701          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);          void copySmoothValues(LinuxSampler::ArrayList<CC>& smooths, LinuxSampler::ArrayList<CC>& dest);
702            
703            int   ToInt(const std::string& s) throw(LinuxSampler::Exception);
704            float ToFloat(const std::string& s) throw(LinuxSampler::Exception);
705    
706            int currentLine;
707          std::string currentDir;          std::string currentDir;
708          /// Pointer to the Instrument belonging to this file          /// Pointer to the Instrument belonging to this file
709          Instrument* _instrument;          Instrument* _instrument;

Legend:
Removed from v.2233  
changed lines
  Added in v.2252

  ViewVC Help
Powered by ViewVC