summaryrefslogtreecommitdiff
path: root/src/lib/playlist.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-03 00:27:09 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-03 00:27:09 +0100
commit9c3e4462d32c726a6c257b0a40e642ab23d9526a (patch)
treecedc2faa6de6264177ea5c465bb26c3330413148 /src/lib/playlist.h
parent7ebb57db2013c9e929d44d0e547ab1f27c59cc7f (diff)
Make subs work again (sort of).
Diffstat (limited to 'src/lib/playlist.h')
-rw-r--r--src/lib/playlist.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 403fb58d4..c461151d4 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -24,6 +24,7 @@
#include "audio_source.h"
#include "video_sink.h"
#include "audio_sink.h"
+#include "ffmpeg_content.h"
class Content;
class FFmpegContent;
@@ -52,6 +53,11 @@ public:
libdcp::Size video_size () const;
ContentVideoFrame video_length () const;
+ std::vector<FFmpegSubtitleStream> ffmpeg_subtitle_streams () const;
+ boost::optional<FFmpegSubtitleStream> ffmpeg_subtitle_stream () const;
+ std::vector<FFmpegAudioStream> ffmpeg_audio_streams () const;
+ boost::optional<FFmpegAudioStream> ffmpeg_audio_stream () const;
+
enum VideoFrom {
VIDEO_NONE,
VIDEO_FFMPEG,