--- libgig/trunk/src/DLS.h 2021/06/18 13:47:46 3940 +++ libgig/trunk/src/DLS.h 2021/06/18 14:06:20 3941 @@ -574,8 +574,9 @@ Sample* GetNextSample() LIBGIG_DEPRECATED_API("Use GetSample() instead."); Sample* AddSample(); void DeleteSample(Sample* pSample); - Instrument* GetFirstInstrument(); ///< Returns a pointer to the first Instrument object of the file, NULL otherwise. - Instrument* GetNextInstrument(); ///< Returns a pointer to the next Instrument object of the file, NULL otherwise. + Instrument* GetInstrument(size_t index); + Instrument* GetFirstInstrument() LIBGIG_DEPRECATED_API("Use GetInstrument() instead."); + Instrument* GetNextInstrument() LIBGIG_DEPRECATED_API("Use GetInstrument() instead."); Instrument* AddInstrument(); void DeleteInstrument(Instrument* pInstrument); RIFF::File* GetRiffFile(); @@ -586,7 +587,7 @@ virtual ~File(); protected: typedef std::vector SampleList; - typedef std::list InstrumentList; + typedef std::vector InstrumentList; RIFF::File* pRIFF; std::list ExtensionFiles; //FIXME: These should automatically be freed, since implicitly allocated.