diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-08-02 00:59:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-08-02 00:59:59 +0100 |
| commit | 12afa3c2bc77b3b18c2b6766012b70e6176a817a (patch) | |
| tree | 9a2dcf4c521cd47ce1615ba3c88241b26121a008 /src/lib | |
| parent | c0d89a899f236c26fdb7c8529c601377839b19fd (diff) | |
| parent | 79ec1946d5410f7844cd37f59919003dd23f0627 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 7 | ||||
| -rw-r--r-- | src/lib/film.h | 1 | ||||
| -rw-r--r-- | src/lib/film_state.cc | 3 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index cb0a44a45..d2a1948ca 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -584,13 +584,6 @@ Film::set_scaler (Scaler const * s) signal_changed (SCALER); } -void -Film::set_frames_per_second (float f) -{ - _state.frames_per_second = f; - signal_changed (FRAMES_PER_SECOND); -} - /** @return full paths to any audio files that this Film has */ vector<string> Film::audio_files () const diff --git a/src/lib/film.h b/src/lib/film.h index dc766252d..3ff671fbe 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -138,7 +138,6 @@ public: void set_bottom_crop (int); void set_left_crop (int); void set_right_crop (int); - void set_frames_per_second (float); void set_format (Format const *); void set_dcp_content_type (DCPContentType const *); void set_audio_gain (float); diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc index e23bf9148..e0ad20417 100644 --- a/src/lib/film_state.cc +++ b/src/lib/film_state.cc @@ -275,9 +275,8 @@ FilmState::bytes_per_sample () const case AV_SAMPLE_FMT_S16: return 2; default: - assert (false); + return 0; } - assert (false); return 0; } |