diff options
author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
---|---|---|
committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /intern/audaspace/jack/AUD_JackDevice.h | |
parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
Diffstat (limited to 'intern/audaspace/jack/AUD_JackDevice.h')
-rw-r--r-- | intern/audaspace/jack/AUD_JackDevice.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/intern/audaspace/jack/AUD_JackDevice.h b/intern/audaspace/jack/AUD_JackDevice.h index 58e34978c1f..418992e0db1 100644 --- a/intern/audaspace/jack/AUD_JackDevice.h +++ b/intern/audaspace/jack/AUD_JackDevice.h @@ -28,7 +28,9 @@ #include "AUD_SoftwareDevice.h" -class AUD_Buffer; +#include "AUD_Buffer.h" + +#include <string> #include <jack.h> #include <ringbuffer.h> @@ -54,9 +56,12 @@ private: /** * The output buffer. */ - AUD_Buffer* m_buffer; + AUD_Buffer m_buffer; - AUD_Buffer* m_deinterleavebuf; + /** + * The deinterleaving buffer. + */ + AUD_Buffer m_deinterleavebuf; jack_ringbuffer_t** m_ringbuffers; @@ -114,16 +119,23 @@ private: void updateRingBuffers(); + // hide copy constructor and operator= + AUD_JackDevice(const AUD_JackDevice&); + AUD_JackDevice& operator=(const AUD_JackDevice&); + protected: virtual void playing(bool playing); public: /** * Creates a Jack client for audio output. - * \param specs The wanted audio specification, where only the channel count is important. + * \param name The client name. + * \param specs The wanted audio specification, where only the channel count + * is important. + * \param buffersize The size of the internal buffer. * \exception AUD_Exception Thrown if the audio device cannot be opened. */ - AUD_JackDevice(AUD_DeviceSpecs specs, int buffersize = AUD_DEFAULT_BUFFER_SIZE); + AUD_JackDevice(std::string name, AUD_DeviceSpecs specs, int buffersize = AUD_DEFAULT_BUFFER_SIZE); /** * Closes the Jack client. |