diff options
author | Joerg Mueller <nexyon@gmail.com> | 2010-07-28 13:36:03 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2010-07-28 13:36:03 +0400 |
commit | 7296600434c49b40215ba842af73a8b1517e12eb (patch) | |
tree | ba41a61f147073c91cf370c1f470b7c519397766 /intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h | |
parent | 3e3f874a65e9c20353fdc26a20a2f5da9b41e90e (diff) |
Audaspace: HUGE Refactor.
Some points of the refactor not sorted by importance:
* Fixed immutability of readers and factories (there are exceptions...)
* Fixed copy constructors and = operators
* Removed messaging system
* Removed reader types
* Added const where possible
* Using initalisers when possible
* Avoided use of pointers when possible
* Removed AUD_NEW and AUD_DELETE macros
* Removed useless NULL pointer checks
* Fixed exception catching
* Fixed some yet unknown bugs
* Lots of other stuff
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h')
-rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h index 22560303a73..43a6ce68ca7 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h @@ -30,6 +30,8 @@ #include "AUD_Reference.h" class AUD_Buffer; +#include <string> + /** * This factory reads a sound file via ffmpeg. * \warning Notice that the needed formats and codecs have to be registered @@ -41,33 +43,32 @@ private: /** * The filename of the sound source file. */ - char* m_filename; + const std::string m_filename; /** * The buffer to read from. */ AUD_Reference<AUD_Buffer> m_buffer; + // hide copy constructor and operator= + AUD_FFMPEGFactory(const AUD_FFMPEGFactory&); + AUD_FFMPEGFactory& operator=(const AUD_FFMPEGFactory&); + public: /** * Creates a new factory. * \param filename The sound file path. */ - AUD_FFMPEGFactory(const char* filename); + AUD_FFMPEGFactory(std::string filename); /** * Creates a new factory. * \param buffer The buffer to read from. * \param size The size of the buffer. */ - AUD_FFMPEGFactory(unsigned char* buffer, int size); - - /** - * Destroys the factory. - */ - ~AUD_FFMPEGFactory(); + AUD_FFMPEGFactory(const data_t* buffer, int size); - virtual AUD_IReader* createReader(); + virtual AUD_IReader* createReader() const; }; #endif //AUD_FFMPEGFACTORY |