Don't cache sample format, fix up various things.

[dcpomatic.git] / src / lib / film_state.cc

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index f2d83e4e27839a3d0ef824673b1d569950358afb..46359677c1e0e3091fcaab4d3c9cf1f677407e13 100644 (file)
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -115,7 +115,6 @@ FilmState::write_metadata () const
        f << "length " << _length << "\n";
        f << "audio_channels " << _audio_channels << "\n";
        f << "audio_sample_rate " << _audio_sample_rate << "\n";
-       f << "audio_sample_format " << audio_sample_format_to_string (_audio_sample_format) << "\n";
        f << "content_digest " << _content_digest << "\n";
        f << "has_subtitles " << _has_subtitles << "\n";
 
@@ -224,8 +223,6 @@ FilmState::read_metadata ()
                        _audio_channels = atoi (v.c_str ());
                } else if (k == "audio_sample_rate") {
                        _audio_sample_rate = atoi (v.c_str ());
-               } else if (k == "audio_sample_format") {
-                       _audio_sample_format = audio_sample_format_from_string (v);
                } else if (k == "content_digest") {
                        _content_digest = v;
                } else if (k == "has_subtitles") {
@@ -354,13 +351,6 @@ FilmState::content_type () const
        return VIDEO;
 }
 
-/** @return Number of bytes per sample of a single channel */
-int
-FilmState::bytes_per_sample () const
-{
-       return av_get_bytes_per_sample (_audio_sample_format);
-}
-
 int
 FilmState::target_sample_rate () const
 {
@@ -543,7 +533,6 @@ FilmState::set_content (string c)
        set_frames_per_second (d->frames_per_second ());
        set_audio_channels (d->audio_channels ());
        set_audio_sample_rate (d->audio_sample_rate ());
-       set_audio_sample_format (d->audio_sample_format ());
        set_has_subtitles (d->has_subtitles ());
        set_audio_streams (d->audio_streams ());
        set_subtitle_streams (d->subtitle_streams ());
@@ -795,13 +784,6 @@ FilmState::set_audio_sample_rate (int r)
        signal_changed (AUDIO_SAMPLE_RATE);
 }
 
-void
-FilmState::set_audio_sample_format (AVSampleFormat f)
-{
-       _audio_sample_format = f;
-       _dirty = true;
-}
-
 void
 FilmState::set_content_digest (string d)
 {