summaryrefslogtreecommitdiff
path: root/src/lib/playlist.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-03 20:44:02 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-03 20:44:02 +0100
commit675e849d19812f5ed2d63b3bc0e34f142e6abb89 (patch)
tree1c33c70c40d60d926513f27c74acce46c6843a72 /src/lib/playlist.cc
parent6198597b190c3c730057bee54e0421fcd7bcb795 (diff)
Allow UI to set up FFmpeg streams again.
Diffstat (limited to 'src/lib/playlist.cc')
-rw-r--r--src/lib/playlist.cc40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 0c29650b6..3da7f938b 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -207,46 +207,6 @@ Playlist::has_audio () const
return _audio_from != AUDIO_NONE;
}
-vector<FFmpegSubtitleStream>
-Playlist::ffmpeg_subtitle_streams () const
-{
- if (_video_from != VIDEO_FFMPEG || !_ffmpeg) {
- return vector<FFmpegSubtitleStream> ();
- }
-
- return _ffmpeg->subtitle_streams ();
-}
-
-boost::optional<FFmpegSubtitleStream>
-Playlist::ffmpeg_subtitle_stream () const
-{
- if (_video_from != VIDEO_FFMPEG || !_ffmpeg) {
- return boost::none;
- }
-
- return _ffmpeg->subtitle_stream ();
-}
-
-vector<FFmpegAudioStream>
-Playlist::ffmpeg_audio_streams () const
-{
- if (_video_from != VIDEO_FFMPEG || !_ffmpeg) {
- return vector<FFmpegAudioStream> ();
- }
-
- return _ffmpeg->audio_streams ();
-}
-
-boost::optional<FFmpegAudioStream>
-Playlist::ffmpeg_audio_stream () const
-{
- if (_video_from != VIDEO_FFMPEG || !_ffmpeg) {
- return boost::none;
- }
-
- return _ffmpeg->audio_stream ();
-}
-
Player::Player (boost::shared_ptr<const Film> f, boost::shared_ptr<const Playlist> p)
: _film (f)
, _playlist (p)