Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-01-01 08:09:30 +0300
committerJoerg Mueller <nexyon@gmail.com>2010-01-01 08:09:30 +0300
commit174eccf07851c4e7f669b194cd8951ca98bc5c81 (patch)
tree42d11467df2d006fcbaa562023ffe09796879716 /intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
parent3fa927a42e893709ac78f7d9419c22979b05bf3f (diff)
Huge new year audio commit!
* Refactored the whole audaspace library to use float as sample format over all readers. * Added new Readers like the linear resampler, envelope, lowpass, highpass and butterworth. * Note: The butterworth filter isn't working correctly, some bug in there... Maybe also true for the envelope. * Added a sound to f-curve operator that behaves mostly like the soundtracker script of technoestupido.
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGReader.h')
-rw-r--r--intern/audaspace/ffmpeg/AUD_FFMPEGReader.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
index 6e303934f36..f992fdf7a34 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
@@ -26,6 +26,7 @@
#ifndef AUD_FFMPEGREADER
#define AUD_FFMPEGREADER
+#include "AUD_ConverterFunctions.h"
#include "AUD_IReader.h"
#include "AUD_Reference.h"
class AUD_Buffer;
@@ -59,7 +60,7 @@ private:
/**
* The specification of the audio data.
*/
- AUD_Specs m_specs;
+ AUD_DeviceSpecs m_specs;
/**
* The buffer for package reading.
@@ -92,6 +93,11 @@ private:
int m_stream;
/**
+ * Converter function.
+ */
+ AUD_convert_f m_convert;
+
+ /**
* The memory file to read from, only saved to keep the buffer alive.
*/
AUD_Reference<AUD_Buffer> m_membuffer;
@@ -104,6 +110,11 @@ private:
*/
int decode(AVPacket* packet, AUD_Buffer* buffer);
+ /**
+ * Initializes the object.
+ */
+ void init();
+
public:
/**
* Creates a new reader.