*/
#include "ffmpeg_stream.h"
-#include "audio_mapping.h"
+#include "audio_stream.h"
#include "dcpomatic_time.h"
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
-class FFmpegAudioStream : public FFmpegStream
+class FFmpegAudioStream : public FFmpegStream, public AudioStream
{
public:
- FFmpegAudioStream (std::string n, int i, int f, int c)
- : FFmpegStream (n, i)
- , frame_rate (f)
- , channels (c)
- , mapping (c)
- {
- mapping.make_default ();
- }
+ FFmpegAudioStream (std::string name, int id, int frame_rate, int channels)
+ : FFmpegStream (name, id)
+ , AudioStream (frame_rate, channels)
+ {}
FFmpegAudioStream (cxml::ConstNodePtr, int);
void as_xml (xmlpp::Node *) const;
- int frame_rate;
- int channels;
- AudioMapping mapping;
+ /* XXX: should probably be locked */
+
boost::optional<ContentTime> first_audio;
private:
/* Constructor for tests */
FFmpegAudioStream ()
: FFmpegStream ("", 0)
- , frame_rate (0)
- , channels (0)
- , mapping (1)
+ , AudioStream (0, 0)
{}
};