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

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

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

revision 2855 by persson, Sat Mar 8 09:04:42 2014 UTC revision 2856 by persson, Wed Jan 6 10:02:40 2016 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 - 2013 Anders Dahnielson and Grigor Iliev          *   *   Copyright (C) 2009 - 2016 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 256  namespace sfz Line 256  namespace sfz
256      }      }
257    
258      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
259      // class Group      // class ContainerDefinition
260    
261      Group::Group() :      ContainerDefinition::ContainerDefinition(section_type type)
         id(0)  
262      {      {
263          Reset();          Reset();
264            level = type;
265      }      }
266    
267      Group::~Group()      ContainerDefinition::~ContainerDefinition()
268      {      {
269      }      }
270    
271      void      void
272      Group::Reset()      ContainerDefinition::Reset()
273      {      {
274          // This is where all the default values are set.          // This is where all the default values are set.
275    
# Line 558  namespace sfz Line 558  namespace sfz
558          pitchlfo_freqcc.clear();          pitchlfo_freqcc.clear();
559      }      }
560    
561      Region*      void ContainerDefinition::CopyValuesToDefinition(Definition* definition)
     Group::RegionFactory()  
562      {      {
563          // This is where the current group setting are copied to the new region.          // This is where the current settings are copied to the new definition.
   
         Region* region = new Region();  
   
         region->id = id++;  
564    
565          // sample definition          // sample definition
566          region->sample = sample;          definition->sample = sample;
567    
568          // input control          // input control
569          region->lochan = lochan;          definition->lochan = lochan;
570          region->hichan = hichan;          definition->hichan = hichan;
571          region->lokey = lokey;          definition->lokey = lokey;
572          region->hikey = hikey;          definition->hikey = hikey;
573          region->lovel = lovel;          definition->lovel = lovel;
574          region->hivel = hivel;          definition->hivel = hivel;
575          region->locc = locc;          definition->locc = locc;
576          region->hicc = hicc;          definition->hicc = hicc;
577          region->lobend = lobend;          definition->lobend = lobend;
578          region->hibend = hibend;          definition->hibend = hibend;
579          region->lobpm = lobpm;          definition->lobpm = lobpm;
580          region->hibpm = hibpm;          definition->hibpm = hibpm;
581          region->lochanaft = lochanaft;          definition->lochanaft = lochanaft;
582          region->hichanaft = hichanaft;          definition->hichanaft = hichanaft;
583          region->lopolyaft = lopolyaft;          definition->lopolyaft = lopolyaft;
584          region->hipolyaft = hipolyaft;          definition->hipolyaft = hipolyaft;
585          region->loprog = loprog;          definition->loprog = loprog;
586          region->hiprog = hiprog;          definition->hiprog = hiprog;
587          region->lorand = lorand;          definition->lorand = lorand;
588          region->hirand = hirand;          definition->hirand = hirand;
589          region->lotimer = lotimer;          definition->lotimer = lotimer;
590          region->hitimer = hitimer;          definition->hitimer = hitimer;
591          region->seq_length = seq_length;          definition->seq_length = seq_length;
592          region->seq_position = seq_position;          definition->seq_position = seq_position;
593          region->start_locc = start_locc;          definition->start_locc = start_locc;
594          region->start_hicc = start_hicc;          definition->start_hicc = start_hicc;
595          region->stop_locc = stop_locc;          definition->stop_locc = stop_locc;
596          region->stop_hicc = stop_hicc;          definition->stop_hicc = stop_hicc;
597          region->sw_lokey = sw_lokey;          definition->sw_lokey = sw_lokey;
598          region->sw_hikey = sw_hikey;          definition->sw_hikey = sw_hikey;
599          region->sw_last = sw_last;          definition->sw_last = sw_last;
600          region->sw_down = sw_down;          definition->sw_down = sw_down;
601          region->sw_up = sw_up;          definition->sw_up = sw_up;
602          region->sw_previous = sw_previous;          definition->sw_previous = sw_previous;
603          region->sw_vel = sw_vel;          definition->sw_vel = sw_vel;
604          region->trigger = trigger;          definition->trigger = trigger;
605          region->group = group;          definition->group = group;
606          region->off_by = off_by;          definition->off_by = off_by;
607          region->off_mode = off_mode;          definition->off_mode = off_mode;
608          region->on_locc = on_locc;          definition->on_locc = on_locc;
609          region->on_hicc = on_hicc;          definition->on_hicc = on_hicc;
610    
611          // sample player          // sample player
612          region->count = count;          definition->count = count;
613          region->delay = delay;          definition->delay = delay;
614          region->delay_random = delay_random;          definition->delay_random = delay_random;
615          region->delay_oncc = delay_oncc;          definition->delay_oncc = delay_oncc;
616          region->delay_beats = delay_beats;          definition->delay_beats = delay_beats;
617          region->stop_beats = stop_beats;          definition->stop_beats = stop_beats;
618          region->delay_samples = delay_samples;          definition->delay_samples = delay_samples;
619          region->delay_samples_oncc = delay_samples_oncc;          definition->delay_samples_oncc = delay_samples_oncc;
620          region->end = end;          definition->end = end;
621          region->loop_crossfade = loop_crossfade;          definition->loop_crossfade = loop_crossfade;
622          region->offset = offset;          definition->offset = offset;
623          region->offset_random = offset_random;          definition->offset_random = offset_random;
624          region->offset_oncc = offset_oncc;          definition->offset_oncc = offset_oncc;
625          region->loop_mode = loop_mode;          definition->loop_mode = loop_mode;
626          region->loop_start = loop_start;          definition->loop_start = loop_start;
627          region->loop_end = loop_end;          definition->loop_end = loop_end;
628          region->sync_beats = sync_beats;          definition->sync_beats = sync_beats;
629          region->sync_offset = sync_offset;          definition->sync_offset = sync_offset;
630    
631          // amplifier          // amplifier
632          region->volume = volume;          definition->volume = volume;
633          region->volume_oncc = volume_oncc;          definition->volume_oncc = volume_oncc;
634          region->volume_curvecc = volume_curvecc;          definition->volume_curvecc = volume_curvecc;
635          region->volume_smoothcc = volume_smoothcc;          definition->volume_smoothcc = volume_smoothcc;
636          region->volume_stepcc = volume_stepcc;          definition->volume_stepcc = volume_stepcc;
637          region->amplitude = amplitude;          definition->amplitude = amplitude;
638          region->pan = pan;          definition->pan = pan;
639          region->pan_oncc = pan_oncc;          definition->pan_oncc = pan_oncc;
640          region->pan_curvecc = pan_curvecc;          definition->pan_curvecc = pan_curvecc;
641          region->pan_smoothcc = pan_smoothcc;          definition->pan_smoothcc = pan_smoothcc;
642          region->pan_stepcc = pan_stepcc;          definition->pan_stepcc = pan_stepcc;
643          region->width = width;          definition->width = width;
644          region->position = position;          definition->position = position;
645          region->amp_keytrack = amp_keytrack;          definition->amp_keytrack = amp_keytrack;
646          region->amp_keycenter = amp_keycenter;          definition->amp_keycenter = amp_keycenter;
647          region->amp_veltrack = amp_veltrack;          definition->amp_veltrack = amp_veltrack;
648          region->amp_velcurve = amp_velcurve;          definition->amp_velcurve = amp_velcurve;
649          region->amp_random = amp_random;          definition->amp_random = amp_random;
650          region->rt_decay = rt_decay;          definition->rt_decay = rt_decay;
651          region->gain_oncc = gain_oncc;          definition->gain_oncc = gain_oncc;
652          region->xfin_lokey = xfin_lokey;          definition->xfin_lokey = xfin_lokey;
653          region->xfin_hikey = xfin_hikey;          definition->xfin_hikey = xfin_hikey;
654          region->xfout_lokey = xfout_lokey;          definition->xfout_lokey = xfout_lokey;
655          region->xfout_hikey = xfout_hikey;          definition->xfout_hikey = xfout_hikey;
656          region->xf_keycurve = xf_keycurve;          definition->xf_keycurve = xf_keycurve;
657          region->xfin_lovel = xfin_lovel;          definition->xfin_lovel = xfin_lovel;
658          region->xfin_hivel = xfin_lovel;          definition->xfin_hivel = xfin_lovel;
659          region->xfout_lovel = xfout_lovel;          definition->xfout_lovel = xfout_lovel;
660          region->xfout_hivel = xfout_hivel;          definition->xfout_hivel = xfout_hivel;
661          region->xf_velcurve = xf_velcurve;          definition->xf_velcurve = xf_velcurve;
662          region->xfin_locc = xfin_locc;          definition->xfin_locc = xfin_locc;
663          region->xfin_hicc = xfin_hicc;          definition->xfin_hicc = xfin_hicc;
664          region->xfout_locc = xfout_locc;          definition->xfout_locc = xfout_locc;
665          region->xfout_hicc = xfout_hicc;          definition->xfout_hicc = xfout_hicc;
666          region->xf_cccurve = xf_cccurve;          definition->xf_cccurve = xf_cccurve;
667    
668          // pitch          // pitch
669          region->transpose = transpose;          definition->transpose = transpose;
670          region->tune = tune;          definition->tune = tune;
671          region->pitch_keycenter = pitch_keycenter;          definition->pitch_keycenter = pitch_keycenter;
672          region->pitch_keytrack = pitch_keytrack;          definition->pitch_keytrack = pitch_keytrack;
673          region->pitch_veltrack = pitch_veltrack;          definition->pitch_veltrack = pitch_veltrack;
674          region->pitch_random = pitch_random;          definition->pitch_random = pitch_random;
675          region->bend_up = bend_up;          definition->bend_up = bend_up;
676          region->bend_down = bend_down;          definition->bend_down = bend_down;
677          region->bend_step = bend_step;          definition->bend_step = bend_step;
678                    
679          region->pitch_oncc     = pitch_oncc;          definition->pitch_oncc     = pitch_oncc;
680          region->pitch_smoothcc = pitch_smoothcc;          definition->pitch_smoothcc = pitch_smoothcc;
681          region->pitch_curvecc  = pitch_curvecc;          definition->pitch_curvecc  = pitch_curvecc;
682          region->pitch_stepcc   = pitch_stepcc;          definition->pitch_stepcc   = pitch_stepcc;
683    
684          // filter          // filter
685          region->fil_type = fil_type;          definition->fil_type = fil_type;
686          region->cutoff = cutoff;          definition->cutoff = cutoff;
687          region->cutoff_oncc = cutoff_oncc;          definition->cutoff_oncc = cutoff_oncc;
688          region->cutoff_smoothcc = cutoff_smoothcc;          definition->cutoff_smoothcc = cutoff_smoothcc;
689          region->cutoff_stepcc = cutoff_stepcc;          definition->cutoff_stepcc = cutoff_stepcc;
690          region->cutoff_curvecc = cutoff_curvecc;          definition->cutoff_curvecc = cutoff_curvecc;
691          region->cutoff_chanaft = cutoff_chanaft;          definition->cutoff_chanaft = cutoff_chanaft;
692          region->cutoff_polyaft = cutoff_polyaft;          definition->cutoff_polyaft = cutoff_polyaft;
693          region->resonance = resonance;          definition->resonance = resonance;
694          region->resonance_oncc = resonance_oncc;          definition->resonance_oncc = resonance_oncc;
695          region->resonance_smoothcc = resonance_smoothcc;          definition->resonance_smoothcc = resonance_smoothcc;
696          region->resonance_stepcc = resonance_stepcc;          definition->resonance_stepcc = resonance_stepcc;
697          region->resonance_curvecc = resonance_curvecc;          definition->resonance_curvecc = resonance_curvecc;
698          region->fil_keytrack = fil_keytrack;          definition->fil_keytrack = fil_keytrack;
699          region->fil_keycenter = fil_keycenter;          definition->fil_keycenter = fil_keycenter;
700          region->fil_veltrack = fil_veltrack;          definition->fil_veltrack = fil_veltrack;
701          region->fil_random = fil_random;          definition->fil_random = fil_random;
702    
703          region->fil2_type = fil2_type;          definition->fil2_type = fil2_type;
704          region->cutoff2 = cutoff2;          definition->cutoff2 = cutoff2;
705          region->cutoff2_oncc = cutoff2_oncc;          definition->cutoff2_oncc = cutoff2_oncc;
706          region->cutoff2_smoothcc = cutoff2_smoothcc;          definition->cutoff2_smoothcc = cutoff2_smoothcc;
707          region->cutoff2_stepcc = cutoff2_stepcc;          definition->cutoff2_stepcc = cutoff2_stepcc;
708          region->cutoff2_curvecc = cutoff2_curvecc;          definition->cutoff2_curvecc = cutoff2_curvecc;
709          region->cutoff2_chanaft = cutoff2_chanaft;          definition->cutoff2_chanaft = cutoff2_chanaft;
710          region->cutoff2_polyaft = cutoff2_polyaft;          definition->cutoff2_polyaft = cutoff2_polyaft;
711          region->resonance2 = resonance2;          definition->resonance2 = resonance2;
712          region->resonance2_oncc = resonance2_oncc;          definition->resonance2_oncc = resonance2_oncc;
713          region->resonance2_smoothcc = resonance2_smoothcc;          definition->resonance2_smoothcc = resonance2_smoothcc;
714          region->resonance2_stepcc = resonance2_stepcc;          definition->resonance2_stepcc = resonance2_stepcc;
715          region->resonance2_curvecc = resonance2_curvecc;          definition->resonance2_curvecc = resonance2_curvecc;
716          region->fil2_keytrack = fil2_keytrack;          definition->fil2_keytrack = fil2_keytrack;
717          region->fil2_keycenter = fil2_keycenter;          definition->fil2_keycenter = fil2_keycenter;
718          region->fil2_veltrack = fil2_veltrack;          definition->fil2_veltrack = fil2_veltrack;
719          region->fil2_random = fil2_random;          definition->fil2_random = fil2_random;
720    
721          // per voice equalizer          // per voice equalizer
722          region->eq1_freq = eq1_freq;          definition->eq1_freq = eq1_freq;
723          region->eq2_freq = eq2_freq;          definition->eq2_freq = eq2_freq;
724          region->eq3_freq = eq3_freq;          definition->eq3_freq = eq3_freq;
725          region->eq1_freq_oncc = eq1_freq_oncc;          definition->eq1_freq_oncc = eq1_freq_oncc;
726          region->eq2_freq_oncc = eq2_freq_oncc;          definition->eq2_freq_oncc = eq2_freq_oncc;
727          region->eq3_freq_oncc = eq3_freq_oncc;          definition->eq3_freq_oncc = eq3_freq_oncc;
728          region->eq1_vel2freq = eq1_vel2freq;          definition->eq1_vel2freq = eq1_vel2freq;
729          region->eq2_vel2freq = eq2_vel2freq;          definition->eq2_vel2freq = eq2_vel2freq;
730          region->eq3_vel2freq = eq3_vel2freq;          definition->eq3_vel2freq = eq3_vel2freq;
731          region->eq1_bw = eq1_bw;          definition->eq1_bw = eq1_bw;
732          region->eq2_bw = eq2_bw;          definition->eq2_bw = eq2_bw;
733          region->eq3_bw = eq3_bw;          definition->eq3_bw = eq3_bw;
734          region->eq1_bw_oncc = eq1_bw_oncc;          definition->eq1_bw_oncc = eq1_bw_oncc;
735          region->eq2_bw_oncc = eq2_bw_oncc;          definition->eq2_bw_oncc = eq2_bw_oncc;
736          region->eq3_bw_oncc = eq3_bw_oncc;          definition->eq3_bw_oncc = eq3_bw_oncc;
737          region->eq1_gain = eq1_gain;          definition->eq1_gain = eq1_gain;
738          region->eq2_gain = eq2_gain;          definition->eq2_gain = eq2_gain;
739          region->eq3_gain = eq3_gain;          definition->eq3_gain = eq3_gain;
740          region->eq1_gain_oncc = eq1_gain_oncc;          definition->eq1_gain_oncc = eq1_gain_oncc;
741          region->eq2_gain_oncc = eq2_gain_oncc;          definition->eq2_gain_oncc = eq2_gain_oncc;
742          region->eq3_gain_oncc = eq3_gain_oncc;          definition->eq3_gain_oncc = eq3_gain_oncc;
743          region->eq1_vel2gain = eq1_vel2gain;          definition->eq1_vel2gain = eq1_vel2gain;
744          region->eq2_vel2gain = eq2_vel2gain;          definition->eq2_vel2gain = eq2_vel2gain;
745          region->eq3_vel2gain = eq3_vel2gain;          definition->eq3_vel2gain = eq3_vel2gain;
746    
747          // envelope generator          // envelope generator
748          region->eg = eg;          definition->eg = eg;
749    
750          // deprecated          // deprecated
751          region->ampeg_delay    = ampeg_delay;          definition->ampeg_delay    = ampeg_delay;
752          region->ampeg_start    = ampeg_start;          definition->ampeg_start    = ampeg_start;
753          region->ampeg_attack   = ampeg_attack;          definition->ampeg_attack   = ampeg_attack;
754          region->ampeg_hold     = ampeg_hold;          definition->ampeg_hold     = ampeg_hold;
755          region->ampeg_decay    = ampeg_decay;          definition->ampeg_decay    = ampeg_decay;
756          region->ampeg_sustain  = ampeg_sustain;          definition->ampeg_sustain  = ampeg_sustain;
757          region->ampeg_release  = ampeg_release;          definition->ampeg_release  = ampeg_release;
758    
759          region->ampeg_vel2delay   = ampeg_vel2delay;          definition->ampeg_vel2delay   = ampeg_vel2delay;
760          region->ampeg_vel2attack  = ampeg_vel2attack;          definition->ampeg_vel2attack  = ampeg_vel2attack;
761          region->ampeg_vel2hold    = ampeg_vel2hold;          definition->ampeg_vel2hold    = ampeg_vel2hold;
762          region->ampeg_vel2decay   = ampeg_vel2decay;          definition->ampeg_vel2decay   = ampeg_vel2decay;
763          region->ampeg_vel2sustain = ampeg_vel2sustain;          definition->ampeg_vel2sustain = ampeg_vel2sustain;
764          region->ampeg_vel2release = ampeg_vel2release;          definition->ampeg_vel2release = ampeg_vel2release;
765                    
766          region->ampeg_delaycc   = ampeg_delaycc;          definition->ampeg_delaycc   = ampeg_delaycc;
767          region->ampeg_startcc   = ampeg_startcc;          definition->ampeg_startcc   = ampeg_startcc;
768          region->ampeg_attackcc  = ampeg_attackcc;          definition->ampeg_attackcc  = ampeg_attackcc;
769          region->ampeg_holdcc    = ampeg_holdcc;          definition->ampeg_holdcc    = ampeg_holdcc;
770          region->ampeg_decaycc   = ampeg_decaycc;          definition->ampeg_decaycc   = ampeg_decaycc;
771          region->ampeg_sustaincc = ampeg_sustaincc;          definition->ampeg_sustaincc = ampeg_sustaincc;
772          region->ampeg_releasecc = ampeg_releasecc;          definition->ampeg_releasecc = ampeg_releasecc;
773    
774          region->fileg_delay    = fileg_delay;          definition->fileg_delay    = fileg_delay;
775          region->fileg_start    = fileg_start;          definition->fileg_start    = fileg_start;
776          region->fileg_attack   = fileg_attack;          definition->fileg_attack   = fileg_attack;
777          region->fileg_hold     = fileg_hold;          definition->fileg_hold     = fileg_hold;
778          region->fileg_decay    = fileg_decay;          definition->fileg_decay    = fileg_decay;
779          region->fileg_sustain  = fileg_sustain;          definition->fileg_sustain  = fileg_sustain;
780          region->fileg_release  = fileg_release;          definition->fileg_release  = fileg_release;
781          region->fileg_depth    = fileg_depth;          definition->fileg_depth    = fileg_depth;
782    
783          region->fileg_vel2delay   = fileg_vel2delay;          definition->fileg_vel2delay   = fileg_vel2delay;
784          region->fileg_vel2attack  = fileg_vel2attack;          definition->fileg_vel2attack  = fileg_vel2attack;
785          region->fileg_vel2hold    = fileg_vel2hold;          definition->fileg_vel2hold    = fileg_vel2hold;
786          region->fileg_vel2decay   = fileg_vel2decay;          definition->fileg_vel2decay   = fileg_vel2decay;
787          region->fileg_vel2sustain = fileg_vel2sustain;          definition->fileg_vel2sustain = fileg_vel2sustain;
788          region->fileg_vel2release = fileg_vel2release;          definition->fileg_vel2release = fileg_vel2release;
789                    
790          region->fileg_delay_oncc   = fileg_delay_oncc;          definition->fileg_delay_oncc   = fileg_delay_oncc;
791          region->fileg_start_oncc   = fileg_start_oncc;          definition->fileg_start_oncc   = fileg_start_oncc;
792          region->fileg_attack_oncc  = fileg_attack_oncc;          definition->fileg_attack_oncc  = fileg_attack_oncc;
793          region->fileg_hold_oncc    = fileg_hold_oncc;          definition->fileg_hold_oncc    = fileg_hold_oncc;
794          region->fileg_decay_oncc   = fileg_decay_oncc;          definition->fileg_decay_oncc   = fileg_decay_oncc;
795          region->fileg_sustain_oncc = fileg_sustain_oncc;          definition->fileg_sustain_oncc = fileg_sustain_oncc;
796          region->fileg_release_oncc = fileg_release_oncc;          definition->fileg_release_oncc = fileg_release_oncc;
797          region->fileg_depth_oncc   = fileg_depth_oncc;          definition->fileg_depth_oncc   = fileg_depth_oncc;
798    
799          region->pitcheg_delay    = pitcheg_delay;          definition->pitcheg_delay    = pitcheg_delay;
800          region->pitcheg_start    = pitcheg_start;          definition->pitcheg_start    = pitcheg_start;
801          region->pitcheg_attack   = pitcheg_attack;          definition->pitcheg_attack   = pitcheg_attack;
802          region->pitcheg_hold     = pitcheg_hold;          definition->pitcheg_hold     = pitcheg_hold;
803          region->pitcheg_decay    = pitcheg_decay;          definition->pitcheg_decay    = pitcheg_decay;
804          region->pitcheg_sustain  = pitcheg_sustain;          definition->pitcheg_sustain  = pitcheg_sustain;
805          region->pitcheg_release  = pitcheg_release;          definition->pitcheg_release  = pitcheg_release;
806          region->pitcheg_depth    = pitcheg_depth;          definition->pitcheg_depth    = pitcheg_depth;
807    
808          region->pitcheg_vel2delay   = pitcheg_vel2delay;          definition->pitcheg_vel2delay   = pitcheg_vel2delay;
809          region->pitcheg_vel2attack  = pitcheg_vel2attack;          definition->pitcheg_vel2attack  = pitcheg_vel2attack;
810          region->pitcheg_vel2hold    = pitcheg_vel2hold;          definition->pitcheg_vel2hold    = pitcheg_vel2hold;
811          region->pitcheg_vel2decay   = pitcheg_vel2decay;          definition->pitcheg_vel2decay   = pitcheg_vel2decay;
812          region->pitcheg_vel2sustain = pitcheg_vel2sustain;          definition->pitcheg_vel2sustain = pitcheg_vel2sustain;
813          region->pitcheg_vel2release = pitcheg_vel2release;          definition->pitcheg_vel2release = pitcheg_vel2release;
814                    
815          region->pitcheg_delay_oncc   = pitcheg_delay_oncc;          definition->pitcheg_delay_oncc   = pitcheg_delay_oncc;
816          region->pitcheg_start_oncc   = pitcheg_start_oncc;          definition->pitcheg_start_oncc   = pitcheg_start_oncc;
817          region->pitcheg_attack_oncc  = pitcheg_attack_oncc;          definition->pitcheg_attack_oncc  = pitcheg_attack_oncc;
818          region->pitcheg_hold_oncc    = pitcheg_hold_oncc;          definition->pitcheg_hold_oncc    = pitcheg_hold_oncc;
819          region->pitcheg_decay_oncc   = pitcheg_decay_oncc;          definition->pitcheg_decay_oncc   = pitcheg_decay_oncc;
820          region->pitcheg_sustain_oncc = pitcheg_sustain_oncc;          definition->pitcheg_sustain_oncc = pitcheg_sustain_oncc;
821          region->pitcheg_release_oncc = pitcheg_release_oncc;          definition->pitcheg_release_oncc = pitcheg_release_oncc;
822          region->pitcheg_depth_oncc   = pitcheg_depth_oncc;          definition->pitcheg_depth_oncc   = pitcheg_depth_oncc;
823    
824          region->amplfo_delay     = amplfo_delay;          definition->amplfo_delay     = amplfo_delay;
825          region->amplfo_fade      = amplfo_fade;          definition->amplfo_fade      = amplfo_fade;
826          region->amplfo_freq      = amplfo_freq;          definition->amplfo_freq      = amplfo_freq;
827          region->amplfo_depth     = amplfo_depth;          definition->amplfo_depth     = amplfo_depth;
828                    
829          region->amplfo_delay_oncc = amplfo_delay_oncc;          definition->amplfo_delay_oncc = amplfo_delay_oncc;
830          region->amplfo_fade_oncc  = amplfo_fade_oncc;          definition->amplfo_fade_oncc  = amplfo_fade_oncc;
831          region->amplfo_depthcc   = amplfo_depthcc;          definition->amplfo_depthcc   = amplfo_depthcc;
832          region->amplfo_freqcc    = amplfo_freqcc;          definition->amplfo_freqcc    = amplfo_freqcc;
833    
834          region->fillfo_delay     = fillfo_delay;          definition->fillfo_delay     = fillfo_delay;
835          region->fillfo_fade      = fillfo_fade;          definition->fillfo_fade      = fillfo_fade;
836          region->fillfo_freq      = fillfo_freq;          definition->fillfo_freq      = fillfo_freq;
837          region->fillfo_depth     = fillfo_depth;          definition->fillfo_depth     = fillfo_depth;
838                    
839          region->fillfo_delay_oncc = fillfo_delay_oncc;          definition->fillfo_delay_oncc = fillfo_delay_oncc;
840          region->fillfo_fade_oncc  = fillfo_fade_oncc;          definition->fillfo_fade_oncc  = fillfo_fade_oncc;
841          region->fillfo_depthcc   = fillfo_depthcc;          definition->fillfo_depthcc   = fillfo_depthcc;
842          region->fillfo_freqcc    = fillfo_freqcc;          definition->fillfo_freqcc    = fillfo_freqcc;
843    
844          region->pitchlfo_delay   = pitchlfo_delay;          definition->pitchlfo_delay   = pitchlfo_delay;
845          region->pitchlfo_fade    = pitchlfo_fade;          definition->pitchlfo_fade    = pitchlfo_fade;
846          region->pitchlfo_freq    = pitchlfo_freq;          definition->pitchlfo_freq    = pitchlfo_freq;
847          region->pitchlfo_depth   = pitchlfo_depth;          definition->pitchlfo_depth   = pitchlfo_depth;
848                    
849          region->pitchlfo_delay_oncc = pitchlfo_delay_oncc;          definition->pitchlfo_delay_oncc = pitchlfo_delay_oncc;
850          region->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;          definition->pitchlfo_fade_oncc  = pitchlfo_fade_oncc;
851          region->pitchlfo_depthcc = pitchlfo_depthcc;          definition->pitchlfo_depthcc = pitchlfo_depthcc;
852          region->pitchlfo_freqcc  = pitchlfo_freqcc;          definition->pitchlfo_freqcc  = pitchlfo_freqcc;
853                    
854          region->eg = eg;          definition->eg = eg;
855          region->lfos = lfos;          definition->lfos = lfos;
   
         return region;  
856      }      }
857    
858      /////////////////////////////////////////////////////////////      /////////////////////////////////////////////////////////////
859      // class File      // class File
860    
861        const std::string File::MACRO_NAME_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
862        const std::string File::MACRO_VALUE_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_. /\\";
863    
864      File::File(std::string file, SampleManager* pSampleManager) :      File::File(std::string file, SampleManager* pSampleManager) :
865          _current_section(GROUP),          _current_section(GLOBAL),
866          default_path(""),          default_path(""),
867          octave_offset(0),          octave_offset(0),
868          note_offset(0)          note_offset(0),
869            id(0)
870      {      {
871          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);          _instrument = new Instrument(LinuxSampler::Path::getBaseName(file), pSampleManager);
872          _current_group = new Group();          ContainerDefinition* defaultGlobalContainer = new ContainerDefinition(ContainerDefinition::GLOBAL);
873          pCurDef = _current_group;          _current_containers.push(defaultGlobalContainer);
874            pCurDef = defaultGlobalContainer;
875    
876          parseFile(file,pSampleManager);          parseFile(file,pSampleManager);
877    
# Line 1098  namespace sfz Line 1096  namespace sfz
1096                  currentLine = cl;                  currentLine = cl;
1097                  continue;                  continue;
1098              }              }
1099                // #define
1100                else if (line.find("#define") == 0)
1101                {
1102                    
1103                    size_t varname_start = line.find_first_not_of("\t ", std::strlen("#define"));
1104                    size_t varname_end = line.find_first_of("\t ", varname_start + 1);
1105                    size_t value_start = line.find_first_not_of("\t ", varname_end + 1);
1106                    
1107                    std::string varname = line.substr(varname_start, varname_end - varname_start);
1108                    std::string value = line.substr(value_start, std::string::npos);
1109                    
1110                    if (varname.size() == 0 || value.size() == 0)
1111                    {
1112                        std::cerr << "sfz error: Malformed #define statement on line " << currentLine << std::endl;
1113                        continue;
1114                    }
1115                    
1116                    // Deal with DOS EOLs
1117                    if (value[value.size() - 1] == '\r')
1118                    {
1119                        value.erase(value.size() - 1);
1120                    }
1121                    
1122                    // Check varname
1123                    if (varname[0] != '$')
1124                    {
1125                        std::cerr << "sfz error: Macro name '" << varname;
1126                        std::cerr << "' doesn't start with '$'." << std::endl;
1127                        continue;
1128                    }
1129                    // Invalid chars
1130                    if (varname.find_first_not_of(MACRO_NAME_CHARS, 1) != std::string::npos)
1131                    {
1132                        std::cerr << "sfz error: Macro name '" << varname;
1133                        std::cerr << "' contains invalid characters." << std::endl;
1134                    }
1135                    
1136                    // Check value
1137                    // Match alphanumeric, underscore, and decimal point.
1138                    if (value.find_first_not_of(MACRO_VALUE_CHARS) != std::string::npos)
1139                    {
1140                        std::cerr << "sfz error: Macro value '" << value;
1141                        std::cerr << "' contains invalid characters." << std::endl;
1142                        continue;
1143                    }
1144                    
1145                    _defined_macros[varname] = value;
1146                    
1147                    continue;
1148                }
1149    
1150              // DEFINITION              // DEFINITION
1151              std::stringstream linestream(line);              std::stringstream linestream(line);
# Line 1175  namespace sfz Line 1223  namespace sfz
1223    
1224      File::~File()      File::~File()
1225      {      {
1226          delete _current_group;          for (int i = 0; i < _current_containers.size(); i++)
1227            {
1228                delete _current_containers.top();
1229                _current_containers.pop();
1230            }
1231          delete _instrument;          delete _instrument;
1232      }      }
1233    
# Line 1240  namespace sfz Line 1292  namespace sfz
1292      void      void
1293      File::push_header(std::string token)      File::push_header(std::string token)
1294      {      {
1295          if (token == "<group>")          if (token == "<global>" ||
1296                token == "<master>" ||
1297                token == "<group>")
1298          {          {
1299              _current_section = GROUP;              ContainerDefinition::section_type level;
1300              _current_group->Reset();              
1301              pCurDef = _current_group;              if (token == "<global>")
1302                {
1303                    _current_section = GLOBAL;
1304                    level = ContainerDefinition::GLOBAL;
1305                }
1306                else if (token == "<master>")
1307                {
1308                    _current_section = MASTER;
1309                    level = ContainerDefinition::MASTER;
1310                }
1311                else if (token == "<group>")
1312                {
1313                    _current_section = GROUP;
1314                    level = ContainerDefinition::GROUP;
1315                }
1316                
1317                ContainerDefinition* newContainer = new ContainerDefinition(level);
1318                
1319                while (_current_containers.size() > 0 && _current_containers.top()->level <= level)
1320                {
1321                    delete _current_containers.top();
1322                    _current_containers.pop();
1323                }
1324                
1325                //If the new header is a <global>, there won't be anything left in _current_containers
1326                //to copy from.
1327                if (_current_containers.size() > 0)
1328                {
1329                    _current_containers.top()->CopyValuesToDefinition(newContainer);
1330                }
1331                _current_containers.push(newContainer);
1332                pCurDef = newContainer;
1333          }          }
1334          else if (token == "<region>")          else if (token == "<region>")
1335          {          {
1336              _current_section = REGION;              _current_section = REGION;
1337              _current_region = _current_group->RegionFactory();              _current_region = new Region();
1338                _current_region->id = id++;
1339                _current_containers.top()->CopyValuesToDefinition(_current_region);
1340              pCurDef = _current_region;              pCurDef = _current_region;
1341              _instrument->regions.push_back(_current_region);              _instrument->regions.push_back(_current_region);
1342              _current_region->SetInstrument(_instrument);              _current_region->SetInstrument(_instrument);
# Line 1285  namespace sfz Line 1372  namespace sfz
1372          std::string value = token.substr(delimiter_index + 1);          std::string value = token.substr(delimiter_index + 1);
1373          int x, y, z;          int x, y, z;
1374                    
1375            // Apply macros
1376            size_t macro_start = 0;
1377            size_t macro_end = 0;
1378            std::string macro_value;
1379            while ((macro_start = value.find("$", macro_start + macro_value.size())) != std::string::npos)
1380            {
1381                macro_end = value.find_first_not_of(MACRO_NAME_CHARS, macro_start + 1);
1382                size_t macro_len = macro_end - macro_start;
1383                std::string macro_name = value.substr(macro_start, macro_len);
1384                if (_defined_macros.count(macro_name) != 0)
1385                {
1386                    macro_value = _defined_macros[macro_name];
1387                    value.replace(macro_start, macro_len, macro_value);
1388                }
1389                else
1390                {
1391                    std::cerr << "Macro '" << macro_name << "' referenced on line ";
1392                    std::cerr << currentLine << " is undefined." << std::endl;
1393                    return;
1394                }
1395            }
1396            
1397          if (_current_section == CURVE) {          if (_current_section == CURVE) {
1398              if (sscanf(key.c_str(), "v%d", &x)) {              if (sscanf(key.c_str(), "v%d", &x)) {
1399                  if (x < 0 || x > 127) {                  if (x < 0 || x > 127) {
# Line 1740  namespace sfz Line 1849  namespace sfz
1849              if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {              if (key_cc.size() > 3 && !strcmp(key_cc.c_str() + (key_cc.size() - 3), "_on")) {
1850                  key_cc = key_cc.substr(0, key_cc.size() - 3);                  key_cc = key_cc.substr(0, key_cc.size() - 3);
1851              }              }
1852              int num_cc = ToInt(key.substr(delimiter_index + 2));              
1853                // Apply macros
1854                std::string num_cc_str = key.substr(delimiter_index + 2);
1855                
1856                if (num_cc_str[0] == '$')
1857                {
1858                    if (_defined_macros.count(num_cc_str) == 0)
1859                    {
1860                        std::cerr << "Macro '" << value << "' referenced on line ";
1861                        std::cerr << currentLine << " is undefined." << std::endl;
1862                        return;
1863                    }
1864                    
1865                    num_cc_str = _defined_macros[num_cc_str];
1866                }
1867                
1868                int num_cc = ToInt(num_cc_str);
1869    
1870              // input controls              // input controls
1871              if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));              if ("lo" == key_cc) pCurDef->locc.set(num_cc, ToInt(value));

Legend:
Removed from v.2855  
changed lines
  Added in v.2856

  ViewVC Help
Powered by ViewVC