summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-23 12:52:49 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-23 12:52:49 +0100
commit8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (patch)
tree07e1d5f76b0c5fcb614831e72d196dd814132e49 /src/lib/player.h
parente8819ad7580f25eea7ca3c59cf0a3979d76a6b44 (diff)
Various more hacks.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index b0179ca73..c8f6eecb8 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -51,7 +51,7 @@ public:
void disable_audio ();
void disable_subtitles ();
- void pass ();
+ bool pass ();
void seek (Time);
void seek_back ();
void seek_forward ();
@@ -62,13 +62,11 @@ public:
private:
- void process_video (boost::shared_ptr<Piece>, boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
- void process_audio (boost::shared_ptr<Piece>, boost::shared_ptr<const AudioBuffers>, Time);
+ void process_video (boost::weak_ptr<Content>, boost::shared_ptr<const Image>, bool, boost::shared_ptr<Subtitle>, Time);
+ void process_audio (boost::weak_ptr<Content>, boost::shared_ptr<const AudioBuffers>, Time);
void setup_pieces ();
void playlist_changed ();
void content_changed (boost::weak_ptr<Content>, int);
- void emit_black_frame ();
- void emit_silence (Time);
boost::shared_ptr<const Film> _film;
boost::shared_ptr<const Playlist> _playlist;