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/audio_content.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/lib/audio_content.cc')
| -rw-r--r-- | src/lib/audio_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index c0e99b24c..61357c60f 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -90,7 +90,7 @@ AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> : Content (f, c) { shared_ptr<AudioContent> ref = dynamic_pointer_cast<AudioContent> (c[0]); - assert (ref); + DCPOMATIC_ASSERT (ref); for (size_t i = 0; i < c.size(); ++i) { shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c[i]); @@ -163,7 +163,7 @@ boost::signals2::connection AudioContent::analyse_audio (boost::function<void()> finished) { shared_ptr<const Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this()))); boost::signals2::connection c = job->Finished.connect (finished); @@ -210,7 +210,7 @@ int AudioContent::resampled_audio_frame_rate () const { shared_ptr<const Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); /* Resample to a DCI-approved sample rate */ double t = dcp_audio_frame_rate (audio_frame_rate ()); |