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 8dd8309a8f0358a2d35c556623f6e569fe487d55..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);
@@ -431,6 +432,9 @@ FilmState::dci_name () const
        case 6:
                d << "51_";
                break;
+       case 8:
+               d << "71_";
+               break;
        }
 
        d << "2K_";
@@ -526,7 +530,6 @@ FilmState::set_content (string c)
        shared_ptr<Decoder> d = decoder_factory (s, o, 0, 0);
        
        set_size (d->native_size ());
-       set_length (d->length_in_frames ());
        set_frames_per_second (d->frames_per_second ());
        set_audio_sample_rate (d->audio_sample_rate ());
        set_has_subtitles (d->has_subtitles ());
@@ -534,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 (content_path ()));
        
        _content = c;
        signal_changed (CONTENT);
+
+       set_content_digest (md5_digest (content_path ()));
 }
               
 void
@@ -830,6 +834,3 @@ FilmState::audio_channels () const
 
        return _audio_streams[_audio_stream].channels ();
 }
-
-
-