projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
audio_source.h
diff --git
a/src/lib/audio_source.h
b/src/lib/audio_source.h
index 3dc998ccacd7156cf2f766b7f40dff009791fcb2..c7f0a09ed762c438250e67394dc50ab33dcb0892 100644
(file)
--- a/
src/lib/audio_source.h
+++ b/
src/lib/audio_source.h
@@
-21,8
+21,8
@@
* @brief Parent class for classes which emit audio data.
*/
* @brief Parent class for classes which emit audio data.
*/
-#ifndef D
VD
OMATIC_AUDIO_SOURCE_H
-#define D
VD
OMATIC_AUDIO_SOURCE_H
+#ifndef D
CP
OMATIC_AUDIO_SOURCE_H
+#define D
CP
OMATIC_AUDIO_SOURCE_H
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
@@
-35,7
+35,7
@@
class AudioSource
{
public:
/** Emitted when some audio data is ready */
{
public:
/** Emitted when some audio data is ready */
- boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>)> Audio;
+ boost::signals2::signal<void (boost::shared_ptr<
const
AudioBuffers>)> Audio;
void connect_audio (boost::shared_ptr<AudioSink>);
};
void connect_audio (boost::shared_ptr<AudioSink>);
};
@@
-46,8
+46,9
@@
class TimedAudioSource
{
public:
/** Emitted when some audio data is ready */
{
public:
/** Emitted when some audio data is ready */
- boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, double)> Audio;
+ boost::signals2::signal<void (boost::shared_ptr<
const
AudioBuffers>, double)> Audio;
+ void connect_audio (boost::shared_ptr<AudioSink>);
void connect_audio (boost::shared_ptr<TimedAudioSink>);
};
void connect_audio (boost::shared_ptr<TimedAudioSink>);
};