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/wx/timeline.cc | |
| parent | ab32f60c2c9f2ad01dc8d96dc375df256dba0c41 (diff) | |
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 556e6f1b3..6bce881a4 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -96,7 +96,7 @@ public: dcpomatic::Rect<int> bbox () const { - assert (_track); + DCPOMATIC_ASSERT (_track); shared_ptr<const Film> film = _timeline.film (); shared_ptr<const Content> content = _content.lock (); @@ -145,7 +145,7 @@ private: void do_paint (wxGraphicsContext* gc) { - assert (_track); + DCPOMATIC_ASSERT (_track); shared_ptr<const Film> film = _timeline.film (); shared_ptr<const Content> cont = content (); @@ -749,7 +749,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) _down_view->content()->set_position (new_position); shared_ptr<Film> film = _film.lock (); - assert (film); + DCPOMATIC_ASSERT (film); film->set_sequence_video (false); } |