--- libgig/trunk/src/DLS.h 2004/04/27 09:06:07 55 +++ libgig/trunk/src/DLS.h 2005/05/08 16:19:34 518 @@ -2,8 +2,8 @@ * * * libgig - C++ cross-platform Gigasampler format file loader library * * * - * Copyright (C) 2003, 2004 by Christian Schoenebeck * - * * + * Copyright (C) 2003-2005 by Christian Schoenebeck * + * * * * * This library is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -290,7 +290,7 @@ Connection* pConnections; ///< Points to the beginning of a Connection array. uint32_t Connections; ///< Reflects the number of Connections. Articulation(RIFF::List* artList); - ~Articulation(); + virtual ~Articulation(); }; /** Abstract base class for classes that provide articulation information (thus for Instrument and Region class). */ @@ -306,7 +306,7 @@ ArticulationList::iterator ArticulationsIterator; void LoadArticulations(); - ~Articulator(); + virtual ~Articulator(); }; /** Optional information for DLS files, instruments, samples, etc. */ @@ -352,7 +352,7 @@ Resource* pParent; Resource(Resource* Parent, RIFF::List* lstResource); - ~Resource(); + virtual ~Resource(); }; /** Abstract base class which provides mandatory informations about sample players in general. */ @@ -368,7 +368,7 @@ protected: uint32_t SamplerOptions; Sampler(RIFF::List* ParentList); - ~Sampler(); + virtual ~Sampler(); }; /** Encapsulates sample waves used for playback. */ @@ -417,7 +417,7 @@ Sample* pSample; // every region refers to exactly one sample Region(Instrument* pInstrument, RIFF::List* rgnList); - ~Region(); + virtual ~Region(); friend class Instrument; }; @@ -446,7 +446,7 @@ Instrument(File* pFile, RIFF::List* insList); void LoadRegions(); - ~Instrument(); + virtual ~Instrument(); friend class File; }; @@ -461,7 +461,7 @@ Sample* GetNextSample(); ///< Returns a pointer to the next Sample object of the file, NULL otherwise. 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. - ~File(); + virtual ~File(); protected: typedef std::list SampleList; typedef std::list InstrumentList; @@ -486,6 +486,9 @@ void PrintMessage(); }; + String libraryName(); + String libraryVersion(); + } // namespace DLS #endif // __DLS_H__