diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-26 00:21:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-26 00:21:53 +0100 |
| commit | c77dabbe4e6bb031edf4aa82f5e890fe605bafe1 (patch) | |
| tree | d3a3f2f34b44eecedabc0240ea82c741b49385ba /src/lib/player.h | |
| parent | 996b0c06e23bcb6b300d7b8799df94993692e07d (diff) | |
Add unfinished timing tab; fix crash on reconstruction of timeline; fix lack of black / silence at end of films.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 4d23d1951..cdedf1676 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -68,6 +68,8 @@ private: void playlist_changed (); void content_changed (boost::weak_ptr<Content>, int); void do_seek (Time, bool); + void add_black_piece (Time, Time); + void add_silent_piece (Time, Time); boost::shared_ptr<const Film> _film; boost::shared_ptr<const Playlist> _playlist; @@ -79,8 +81,6 @@ private: /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */ bool _have_valid_pieces; std::list<boost::shared_ptr<Piece> > _pieces; - - /** Time of the earliest thing not yet to have been emitted */ Time _position; AudioBuffers _audio_buffers; Time _next_audio; |
