/[svn]/libgig/trunk/src/gig.h

Diff of /libgig/trunk/src/gig.h

Parent Directory | Revision Log | View Patch Patch

-revision 3398 by schoenebeck,
Sat Dec  9 16:39:27 2017 UTC
+revision 3723 by schoenebeck,
Wed Jan 22 15:48:32 2020 UTC
 Line 2
   *                                                                         *
   *   libgig - C++ cross-platform Gigasampler format file access library    *
   *                                                                         *
-  *   Copyright (C) 2003-2017 by Christian Schoenebeck                      *
+  *   Copyright (C) 2003-2020 by Christian Schoenebeck                      *
   *                              <cuse@users.sourceforge.net>               *
   *                                                                         *
   *   This library is free software; you can redistribute it and/or modify  *
 Line 50
  # define LIST_TYPE_3GNL 0x33676E6C
  # define LIST_TYPE_3LS  0x334c5320 // own gig format extension
  # define LIST_TYPE_RTIS 0x52544953 // own gig format extension
+ # define LIST_TYPE_3DNM 0x33646e6d
  # define CHUNK_ID_3GIX  0x33676978
  # define CHUNK_ID_3EWA  0x33657761
  # define CHUNK_ID_3LNK  0x336C6E6B
-Line 62
+Line 63
  # define CHUNK_ID_LSNM  0x4c534e4d // own gig format extension
  # define CHUNK_ID_SCSL  0x5343534c // own gig format extension
  # define CHUNK_ID_LSDE  0x4c534445 // own gig format extension
+ # define CHUNK_ID_3DDP  0x33646470
  #else  // little endian
  # define LIST_TYPE_3PRG 0x67727033
  # define LIST_TYPE_3EWL 0x6C776533
-Line 69
+Line 71
  # define LIST_TYPE_3GNL 0x6C6E6733
  # define LIST_TYPE_3LS  0x20534c33 // own gig format extension
  # define LIST_TYPE_RTIS 0x53495452 // own gig format extension
+ # define LIST_TYPE_3DNM 0x6d6e6433
  # define CHUNK_ID_3GIX  0x78696733
  # define CHUNK_ID_3EWA  0x61776533
  # define CHUNK_ID_3LNK  0x6B6E6C33
-Line 81
+Line 84
  # define CHUNK_ID_LSNM  0x4d4e534c // own gig format extension
  # define CHUNK_ID_SCSL  0x4c534353 // own gig format extension
  # define CHUNK_ID_LSDE  0x4544534c // own gig format extension
+ # define CHUNK_ID_3DDP  0x70646433
  #endif // WORDS_BIGENDIAN
  #ifndef GIG_DECLARE_ENUM
-Line 148 
 namespace gig {
+Line 152 
 namespace gig {
          curve_type_unknown   = 0xffffffff  /**< Unknown curve type. */
      );
+     /** Defines the wave form type used by an LFO (gig format extension).
+      *
+      * This is a gig format extension. The original Gigasampler/GigaStudio
+      * software always used a sine (sinus) wave form for all its 3 LFOs, so this
+      * was not configurable in the original gig format. Accordingly setting any
+      * other wave form than sine (sinus) will be ignored by the original
+      * Gigasampler/GigaStudio software.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(lfo_wave_t,
+         lfo_wave_sine     = 0,  /**< Sine (sinus) wave form (this is the default wave form). */
+         lfo_wave_triangle = 1,  /**< Triangle wave form. */
+         lfo_wave_saw      = 2,  /**< Saw (up) wave form (saw down wave form can be achieved by flipping the phase). */
+         lfo_wave_square   = 3,  /**< Square wave form. */
+     );
      /** Dimensions allow to bypass one of the following controllers.
       *
       * @see enumCount(), enumKey(), enumKeys(), enumValue()
-Line 338 
 namespace gig {
+Line 359 
 namespace gig {
          float        zone_size;  ///< Intended for internal usage: reflects the size of each zone (128/zones) for normal split types only, 0 otherwise.
      };
-     /** Defines which frequencies are filtered by the VCF.
+     /** Audio filter types.
+      *
+      * The first 5 filter types are the ones which exist in GigaStudio, and
+      * which are very accurately modeled on LinuxSampler side such that they
+      * would sound with LinuxSampler exactly as with GigaStudio.
+      *
+      * The other filter types listed here are extensions to the gig format and
+      * are LinuxSampler specific filter type implementations. Note that none of
+      * these are duplicates of the GigaStudio filter types. For instance
+      * @c vcf_type_lowpass (GigaStudio) and @c vcf_type_lowpass_2p
+      * (LinuxSampler) are both lowpass filters with 2 poles, however they do
+      * sound differently.
       *
       * @see enumCount(), enumKey(), enumKeys(), enumValue()
       */
      GIG_DECLARE_ENUM(vcf_type_t,
-         vcf_type_lowpass      = 0x00, /**< Standard lowpass filter type. */
+         vcf_type_lowpass       = 0x00, /**< Standard lowpass filter type (GigaStudio). */
-         vcf_type_lowpassturbo = 0xff, /**< More poles than normal lowpass. */
+         vcf_type_lowpassturbo  = 0xff, /**< More poles than normal lowpass (GigaStudio). */
-         vcf_type_bandpass     = 0x01, /**< Bandpass filter type. */
+         vcf_type_bandpass      = 0x01, /**< Bandpass filter type (GigaStudio). */
-         vcf_type_highpass     = 0x02, /**< Highpass filter type. */
+         vcf_type_highpass      = 0x02, /**< Highpass filter type (GigaStudio). */
-         vcf_type_bandreject   = 0x03  /**< Highpass filter type. */
+         vcf_type_bandreject    = 0x03, /**< Band reject filter type (GigaStudio). */
+         vcf_type_lowpass_1p    = 0x11, /**< [gig extension]: 1-pole lowpass filter type (LinuxSampler). */
+         vcf_type_lowpass_2p    = 0x12, /**< [gig extension]: 2-pole lowpass filter type (LinuxSampler). */
+         vcf_type_lowpass_4p    = 0x14, /**< [gig extension]: 4-pole lowpass filter type (LinuxSampler). */
+         vcf_type_lowpass_6p    = 0x16, /**< [gig extension]: 6-pole lowpass filter type (LinuxSampler). */
+         vcf_type_highpass_1p   = 0x21, /**< [gig extension]: 1-pole highpass filter type (LinuxSampler). */
+         vcf_type_highpass_2p   = 0x22, /**< [gig extension]: 2-pole highpass filter type (LinuxSampler). */
+         vcf_type_highpass_4p   = 0x24, /**< [gig extension]: 4-pole highpass filter type (LinuxSampler). */
+         vcf_type_highpass_6p   = 0x26, /**< [gig extension]: 6-pole highpass filter type (LinuxSampler). */
+         vcf_type_bandpass_2p   = 0x32, /**< [gig extension]: 2-pole bandpass filter type (LinuxSampler). */
+         vcf_type_bandreject_2p = 0x42  /**< [gig extension]: 2-pole bandreject filter type (LinuxSampler). */
      );
      /**
-Line 414 
 namespace gig {
+Line 456 
 namespace gig {
          void serialize(Serialization::Archive* archive);
      };
+     /** @brief Defines behaviour of release triggered sample(s) on sustain pedal up event.
+      *
+      * This option defines whether a sustain pedal up event (CC#64) would cause
+      * release triggered samples to be played (if any).
+      *
+      * @b Note: This option is an extension to the original gig file format,
+      * so this option is not available with the original Gigasampler/GigaStudio
+      * software! Currently only LinuxSampler and gigedit support this option!
+      *
+      * By default (which equals the original Gigasampler/GigaStudio behaviour)
+      * no release triggered samples are played if the sustain pedal is released.
+      * So usually in the gig format release triggered samples are only played
+      * on MIDI note-off events.
+      *
+      * @see enumCount(), enumKey(), enumKeys(), enumValue()
+      */
+     GIG_DECLARE_ENUM(sust_rel_trg_t,
+         sust_rel_trg_none        = 0x00, /**< No release triggered sample(s) are played on sustain pedal up (default). */
+         sust_rel_trg_maxvelocity = 0x01, /**< Play release trigger sample(s) on sustain pedal up, and simply use 127 as MIDI velocity for playback. */
+         sust_rel_trg_keyvelocity = 0x02  /**< Play release trigger sample(s) on sustain pedal up, and use the key`s last MIDI note-on velocity for playback. */
+     );
      // just symbol prototyping
      class File;
      class Instrument;
-Line 483 
 namespace gig {
+Line 547 
 namespace gig {
              uint8_t            EG1ControllerAttackInfluence;  ///< Amount EG1 Controller has influence on the EG1 Attack time (0 - 3, where 0 means off).
              uint8_t            EG1ControllerDecayInfluence;   ///< Amount EG1 Controller has influence on the EG1 Decay time (0 - 3, where 0 means off).
              uint8_t            EG1ControllerReleaseInfluence; ///< Amount EG1 Controller has influence on the EG1 Release time (0 - 3, where 0 means off).
+             lfo_wave_t         LFO1WaveForm;                  ///< [gig extension]: The fundamental wave form to be used by the amplitude LFO, e.g. sine, triangle, saw, square (default: sine).
              double             LFO1Frequency;                 ///< Frequency of the sample amplitude LFO (0.10 - 10.00 Hz).
+             double             LFO1Phase;                     ///< [gig extension]: Phase displacement of the amplitude LFO's wave form (0.0° - 360.0°).
              uint16_t           LFO1InternalDepth;             ///< Firm pitch of the sample amplitude LFO (0 - 1200 cents).
              uint16_t           LFO1ControlDepth;              ///< Controller depth influencing sample amplitude LFO pitch (0 - 1200 cents).
              lfo1_ctrl_t        LFO1Controller;                ///< MIDI Controller which controls sample amplitude LFO.
-             bool               LFO1FlipPhase;                 ///< Inverts phase of the sample amplitude LFO wave.
+             bool               LFO1FlipPhase;                 ///< Inverts the polarity of the sample amplitude LFO wave, so it flips the wave form vertically.
              bool               LFO1Sync;                      ///< If set to <i>true</i> only one LFO should be used for all voices.
              // Filter Cutoff Frequency EG/LFO
              uint16_t           EG2PreAttack;                  ///< Preattack value of the filter cutoff EG (0 - 1000 permille).
-Line 502 
 namespace gig {
+Line 568 
 namespace gig {
              uint8_t            EG2ControllerAttackInfluence;  ///< Amount EG2 Controller has influence on the EG2 Attack time (0 - 3, where 0 means off).
              uint8_t            EG2ControllerDecayInfluence;   ///< Amount EG2 Controller has influence on the EG2 Decay time (0 - 3, where 0 means off).
              uint8_t            EG2ControllerReleaseInfluence; ///< Amount EG2 Controller has influence on the EG2 Release time (0 - 3, where 0 means off).
+             lfo_wave_t         LFO2WaveForm;                  ///< [gig extension]: The fundamental wave form to be used by the filter cutoff LFO, e.g. sine, triangle, saw, square (default: sine).
              double             LFO2Frequency;                 ///< Frequency of the filter cutoff LFO (0.10 - 10.00 Hz).
+             double             LFO2Phase;                     ///< [gig extension]: Phase displacement of the filter cutoff LFO's wave form (0.0° - 360.0°).
              uint16_t           LFO2InternalDepth;             ///< Firm pitch of the filter cutoff LFO (0 - 1200 cents).
              uint16_t           LFO2ControlDepth;              ///< Controller depth influencing filter cutoff LFO pitch (0 - 1200).
              lfo2_ctrl_t        LFO2Controller;                ///< MIDI Controlle which controls the filter cutoff LFO.
-             bool               LFO2FlipPhase;                 ///< Inverts phase of the filter cutoff LFO wave.
+             bool               LFO2FlipPhase;                 ///< Inverts the polarity of the filter cutoff LFO wave, so it flips the wave form vertically.
              bool               LFO2Sync;                      ///< If set to <i>true</i> only one LFO should be used for all voices.
              // Sample Pitch EG/LFO
              double             EG3Attack;                     ///< Attack time of the sample pitch EG (0.000 - 10.000s).
              int16_t            EG3Depth;                      ///< Depth of the sample pitch EG (-1200 - +1200).
+             lfo_wave_t         LFO3WaveForm;                  ///< [gig extension]: The fundamental wave form to be used by the pitch LFO, e.g. sine, triangle, saw, square (default: sine).
              double             LFO3Frequency;                 ///< Frequency of the sample pitch LFO (0.10 - 10.00 Hz).
+             double             LFO3Phase;                     ///< [gig extension]: Phase displacement of the pitch LFO's wave form (0.0° - 360.0°).
              int16_t            LFO3InternalDepth;             ///< Firm depth of the sample pitch LFO (-1200 - +1200 cents).
              int16_t            LFO3ControlDepth;              ///< Controller depth of the sample pitch LFO (-1200 - +1200 cents).
              lfo3_ctrl_t        LFO3Controller;                ///< MIDI Controller which controls the sample pitch LFO.
+             bool               LFO3FlipPhase;                 ///< [gig extension]: Inverts the polarity of the pitch LFO wave, so it flips the wave form vertically (@b NOTE: this setting for LFO3 is a gig format extension; flipping the polarity was only available for LFO1 and LFO2 in the original Gigasampler/GigaStudio software).
              bool               LFO3Sync;                      ///< If set to <i>true</i> only one LFO should be used for all voices.
              // Filter
              bool               VCFEnabled;                    ///< If filter should be used.
-Line 554 
 namespace gig {
+Line 625 
 namespace gig {
              uint8_t            DimensionUpperLimits[8];       ///< gig3: defines the upper limit of the dimension values for this dimension region. In case you wondered why this is defined on DimensionRegion level and not on Region level: the zone sizes (upper limits) of the velocity dimension can indeed differ in the individual dimension regions, depending on which zones of the other dimension types are currently selected. So this is exceptional for the velocity dimension only. All other dimension types have the same dimension zone sizes for every single DimensionRegion (of the sample Region).
              eg_opt_t           EG1Options;                    ///< [gig extension]: Behavior options which should be used for envelope generator 1 (volume amplitude EG).
              eg_opt_t           EG2Options;                    ///< [gig extension]: Behavior options which should be used for envelope generator 2 (filter cutoff EG).
+             sust_rel_trg_t     SustainReleaseTrigger;         ///< [gig extension]: Whether a sustain pedal up event shall play release trigger sample.
+             bool               NoNoteOffReleaseTrigger;       ///< [gig extension]: If @c true then don't play a release trigger sample on MIDI note-off events.
              // derived attributes from DLS::Sampler
              using DLS::Sampler::UnityNote;
-Line 580 
 namespace gig {
+Line 653 
 namespace gig {
              using DLS::Sampler::AddSampleLoop;
              using DLS::Sampler::DeleteSampleLoop;
              // overridden methods
-             virtual void SetGain(int32_t gain);
+             virtual void SetGain(int32_t gain) OVERRIDE;
-             virtual void UpdateChunks(progress_t* pProgress);
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
              virtual void CopyAssign(const DimensionRegion* orig);
          protected:
              uint8_t* VelocityTable; ///< For velocity dimensions with custom defined zone ranges only: used for fast converting from velocity MIDI value to dimension bit number.
-Line 707 
 namespace gig {
+Line 780 
 namespace gig {
              double* GetCutoffVelocityTable(curve_type_t vcfVelocityCurve, uint8_t vcfVelocityDynamicRange, uint8_t vcfVelocityScale, vcf_cutoff_ctrl_t vcfCutoffController);
              double* GetVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling);
              double* CreateVelocityTable(curve_type_t curveType, uint8_t depth, uint8_t scaling);
+             bool UsesAnyGigFormatExtension() const;
      };
      /** @brief Encapsulates sample waves of Gigasampler/GigaStudio files used for playback.
-Line 773 
 namespace gig {
+Line 847 
 namespace gig {
              file_offset_t ReadAndLoop(void* pBuffer, file_offset_t SampleCount, playback_state_t* pPlaybackState, DimensionRegion* pDimRgn, buffer_t* pExternalDecompressionBuffer = NULL);
              file_offset_t Write(void* pBuffer, file_offset_t SampleCount);
              Group*        GetGroup() const;
-             virtual void  UpdateChunks(progress_t* pProgress);
+             virtual void  UpdateChunks(progress_t* pProgress) OVERRIDE;
              void CopyAssignMeta(const Sample* orig);
              void CopyAssignWave(const Sample* orig);
              uint32_t GetWaveDataCRC32Checksum();
-Line 867 
 namespace gig {
+Line 941 
 namespace gig {
              void             SplitDimensionZone(dimension_t type, int zone);
              void             SetDimensionType(dimension_t oldType, dimension_t newType);
              // overridden methods
-             virtual void     SetKeyRange(uint16_t Low, uint16_t High);
+             virtual void     SetKeyRange(uint16_t Low, uint16_t High) OVERRIDE;
-             virtual void     UpdateChunks(progress_t* pProgress);
+             virtual void     UpdateChunks(progress_t* pProgress) OVERRIDE;
              virtual void     CopyAssign(const Region* orig);
          protected:
              Region(Instrument* pInstrument, RIFF::List* rgnList);
-Line 879 
 namespace gig {
+Line 953 
 namespace gig {
              DimensionRegion* GetDimensionRegionByBit(const std::map<dimension_t,int>& DimCase);
             ~Region();
              friend class Instrument;
+         private:
+             bool UsesAnyGigFormatExtension() const;
      };
      /** @brief Abstract base class for all MIDI rules.
-Line 961 
 namespace gig {
+Line 1037 
 namespace gig {
          protected:
              MidiRuleCtrlTrigger(RIFF::Chunk* _3ewg);
              MidiRuleCtrlTrigger();
-             void UpdateChunks(uint8_t* pData) const;
+             void UpdateChunks(uint8_t* pData) const OVERRIDE;
              friend class Instrument;
      };
-Line 1001 
 namespace gig {
+Line 1077 
 namespace gig {
          protected:
              MidiRuleLegato(RIFF::Chunk* _3ewg);
              MidiRuleLegato();
-             void UpdateChunks(uint8_t* pData) const;
+             void UpdateChunks(uint8_t* pData) const OVERRIDE;
              friend class Instrument;
      };
-Line 1053 
 namespace gig {
+Line 1129 
 namespace gig {
          protected:
              MidiRuleAlternator(RIFF::Chunk* _3ewg);
              MidiRuleAlternator();
-             void UpdateChunks(uint8_t* pData) const;
+             void UpdateChunks(uint8_t* pData) const OVERRIDE;
              friend class Instrument;
      };
-Line 1073 
 namespace gig {
+Line 1149 
 namespace gig {
      class MidiRuleUnknown : public MidiRule {
          protected:
              MidiRuleUnknown() { }
-             void UpdateChunks(uint8_t* pData) const { }
+             void UpdateChunks(uint8_t* pData) const OVERRIDE { }
              friend class Instrument;
      };
-Line 1097 
 namespace gig {
+Line 1173 
 namespace gig {
       * - <a href="http://doc.linuxsampler.org/Instrument_Scripts/NKSP_Language/Reference/">NKSP Reference Manual</a>
       * - <a href="http://doc.linuxsampler.org/Gigedit/Managing_Scripts">Using Instrument Scripts with Gigedit</a>
       */
-     class Script {
+     class Script : protected DLS::Storage {
          public:
              enum Encoding_t {
                  ENCODING_ASCII = 0 ///< Standard 8 bit US ASCII character encoding (default).
-Line 1114 
 namespace gig {
+Line 1190 
 namespace gig {
              Encoding_t     Encoding;    ///< Format the script's source code text is encoded with.
              Language_t     Language;    ///< Programming language and dialect the script is written in.
              bool           Bypass;      ///< Global bypass: if enabled, this script shall not be executed by the sampler for any instrument.
+             uint8_t        Uuid[16];    ///< Persistent Universally Unique Identifier of this script, which remains identical after any changes to this script.
              String GetScriptAsText();
              void   SetScriptAsText(const String& text);
-Line 1123 
 namespace gig {
+Line 1200 
 namespace gig {
          protected:
              Script(ScriptGroup* group, RIFF::Chunk* ckScri);
              virtual ~Script();
-             void UpdateChunks(progress_t* pProgress);
+             void UpdateChunks(progress_t* pProgress) OVERRIDE;
+             void DeleteChunks() OVERRIDE;
              void RemoveAllScriptReferences();
+             void GenerateUuid();
              friend class ScriptGroup;
              friend class Instrument;
          private:
-Line 1145 
 namespace gig {
+Line 1224 
 namespace gig {
       * not available in the GigaStudio 4 software. It is currently only
       * supported by LinuxSampler and gigedit.
       */
-     class ScriptGroup {
+     class ScriptGroup : protected DLS::Storage {
          public:
              String   Name; ///< Name of this script group. For example to be displayed in an instrument editor.
-Line 1156 
 namespace gig {
+Line 1235 
 namespace gig {
              ScriptGroup(File* file, RIFF::List* lstRTIS);
              virtual ~ScriptGroup();
              void LoadScripts();
-             void UpdateChunks(progress_t* pProgress);
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
+             virtual void DeleteChunks() OVERRIDE;
              friend class Script;
              friend class File;
          private:
-Line 1209 
 namespace gig {
+Line 1289 
 namespace gig {
              Region*   AddRegion();
              void      DeleteRegion(Region* pRegion);
              void      MoveTo(Instrument* dst);
-             virtual void UpdateChunks(progress_t* pProgress);
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
              virtual void CopyAssign(const Instrument* orig);
              // own methods
              Region*   GetRegion(unsigned int Key);
-Line 1250 
 namespace gig {
+Line 1330 
 namespace gig {
              MidiRule** pMidiRules;
              std::vector<_ScriptPooolEntry> scriptPoolFileOffsets;
              std::vector<_ScriptPooolRef>* pScriptRefs;
+             bool UsesAnyGigFormatExtension() const;
      };
      /** @brief Group of Gigasampler samples
-Line 1263 
 namespace gig {
+Line 1345 
 namespace gig {
       * there is always at least one Group in a .gig file, no matter if you
       * created one yet or not.
       */
-     class Group {
+     class Group : public DLS::Storage {
          public:
              String Name; ///< Stores the name of this Group.
-Line 1273 
 namespace gig {
+Line 1355 
 namespace gig {
          protected:
              Group(File* file, RIFF::Chunk* ck3gnm);
              virtual ~Group();
-             virtual void UpdateChunks(progress_t* pProgress);
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
+             virtual void DeleteChunks() OVERRIDE;
              void MoveAll();
              friend class File;
          private:
-Line 1321 
 namespace gig {
+Line 1404 
 namespace gig {
          public:
              static const DLS::version_t VERSION_2;
              static const DLS::version_t VERSION_3;
+             static const DLS::version_t VERSION_4;
              // derived attributes from DLS::Resource
              using DLS::Resource::pInfo;
-Line 1335 
 namespace gig {
+Line 1419 
 namespace gig {
              using DLS::File::Save;
              using DLS::File::GetFileName;
              using DLS::File::SetFileName;
+             using DLS::File::GetRiffFile;
              // overridden  methods
              File();
              File(RIFF::File* pRIFF);
-Line 1342 
 namespace gig {
+Line 1427 
 namespace gig {
              Sample*     GetNextSample();      ///< Returns a pointer to the next <i>Sample</i> object of the file, <i>NULL</i> otherwise.
              Sample*     GetSample(uint index);
              Sample*     AddSample();
+             size_t      CountSamples();
              void        DeleteSample(Sample* pSample);
              Instrument* GetFirstInstrument(); ///< Returns a pointer to the first <i>Instrument</i> object of the file, <i>NULL</i> otherwise.
              Instrument* GetNextInstrument();  ///< Returns a pointer to the next <i>Instrument</i> object of the file, <i>NULL</i> otherwise.
              Instrument* GetInstrument(uint index, progress_t* pProgress = NULL);
              Instrument* AddInstrument();
              Instrument* AddDuplicateInstrument(const Instrument* orig);
+             size_t      CountInstruments();
              void        DeleteInstrument(Instrument* pInstrument);
              Group*      GetFirstGroup(); ///< Returns a pointer to the first <i>Group</i> object of the file, <i>NULL</i> otherwise.
              Group*      GetNextGroup();  ///< Returns a pointer to the next <i>Group</i> object of the file, <i>NULL</i> otherwise.
-Line 1364 
 namespace gig {
+Line 1451 
 namespace gig {
              ScriptGroup* AddScriptGroup();
              void        DeleteScriptGroup(ScriptGroup* pGroup);
              virtual    ~File();
-             virtual void UpdateChunks(progress_t* pProgress);
+             virtual void UpdateChunks(progress_t* pProgress) OVERRIDE;
          protected:
              // overridden protected methods from DLS::File
-             virtual void LoadSamples();
+             virtual void LoadSamples() OVERRIDE;
-             virtual void LoadInstruments();
+             virtual void LoadInstruments() OVERRIDE;
              virtual void LoadGroups();
-             virtual void UpdateFileOffsets();
+             virtual void UpdateFileOffsets() OVERRIDE;
              // own protected methods
              virtual void LoadSamples(progress_t* pProgress);
              virtual void LoadInstruments(progress_t* pProgress);
-Line 1391 
 namespace gig {
+Line 1478 
 namespace gig {
              std::list<Group*>::iterator GroupsIterator;
              bool                        bAutoLoad;
              std::list<ScriptGroup*>*    pScriptGroups;
+             bool UsesAnyGigFormatExtension() const;
      };
      /**

 Legend:



Removed from v.3398
 


changed lines


 
Added in v.3723
 Legend:



Removed from v.3398
 


changed lines


 
Added in v.3723
-Removed from v.3398
+Added in v.3723

	ViewVC Help
Powered by ViewVC