Tidy up test film naming.

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

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index deaacca84fd377767e4185ccd79eeac2c03a5949..0ab38214dd7b1d9cec3a16d7aabce95c6707f781 100644 (file)
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -348,8 +348,9 @@ FilmState::content_type () const
        return VIDEO;
 }
 
+/** @return The sampling rate that we will resample the audio to */
 int
-FilmState::target_sample_rate () const
+FilmState::target_audio_sample_rate () const
 {
        /* Resample to a DCI-approved sample rate */
        double t = dcp_audio_sample_rate (_audio_sample_rate);
@@ -536,10 +537,11 @@ FilmState::set_content (string c)
        set_subtitle_streams (d->subtitle_streams ());
        set_audio_stream (audio_streams().empty() ? -1 : 0);
        set_subtitle_stream (subtitle_streams().empty() ? -1 : 0);
-       set_content_digest (md5_digest (c));
        
        _content = c;
        signal_changed (CONTENT);
+
+       set_content_digest (md5_digest (content_path ()));
 }
               
 void
@@ -809,13 +811,6 @@ FilmState::set_frames_per_second (float f)
        _frames_per_second = f;
        signal_changed (FRAMES_PER_SECOND);
 }
-
-void
-FilmState::set_audio_to_discard (int a)
-{
-       _audio_to_discard = a;
-       signal_changed (AUDIO_TO_DISCARD);
-}
        
 void
 FilmState::signal_changed (Property p)
@@ -839,9 +834,3 @@ FilmState::audio_channels () const
 
        return _audio_streams[_audio_stream].channels ();
 }
-
-int
-FilmState::total_audio_delay () const
-{
-       return _audio_delay - _audio_to_discard;
-}