diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-20 23:37:57 +0000 |
| commit | 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 (patch) | |
| tree | 203675d00d5cc004be6205218f835b6d7a10e925 /src/lib/player.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 695ce00ce..36b13d105 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -337,9 +337,9 @@ Player::get_video (DCPTime time, bool accurate) shared_ptr<Piece> piece = ov.back (); shared_ptr<VideoDecoder> decoder = dynamic_pointer_cast<VideoDecoder> (piece->decoder); - assert (decoder); + DCPOMATIC_ASSERT (decoder); shared_ptr<VideoContent> content = dynamic_pointer_cast<VideoContent> (piece->content); - assert (content); + DCPOMATIC_ASSERT (content); list<ContentVideo> content_video = decoder->get_video (dcp_to_content_video (piece, time), accurate); if (content_video.empty ()) { @@ -415,9 +415,9 @@ Player::get_audio (DCPTime time, DCPTime length, bool accurate) for (list<shared_ptr<Piece> >::iterator i = ov.begin(); i != ov.end(); ++i) { shared_ptr<AudioContent> content = dynamic_pointer_cast<AudioContent> ((*i)->content); - assert (content); + DCPOMATIC_ASSERT (content); shared_ptr<AudioDecoder> decoder = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder); - assert (decoder); + DCPOMATIC_ASSERT (decoder); if (content->audio_frame_rate() == 0) { /* This AudioContent has no audio (e.g. if it is an FFmpegContent with no |