Whitespace.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index dad9d6808464cd8a57af6b2b9ac3125e1c50fe2d..a49e549a7b1837a3b3b1c0dadf895757297c2d5b 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -151,14 +151,14 @@ Film::Film (Film const & o)
 }
 
 string
-Film::video_state_identifier () const
+Film::video_identifier () const
 {
        assert (container ());
        LocaleGuard lg;
 
        stringstream s;
        s << container()->id()
-         << "_" << _playlist->video_digest()
+         << "_" << _playlist->video_identifier()
          << "_" << _dcp_video_frame_rate
          << "_" << scaler()->id()
          << "_" << j2k_bandwidth()
@@ -173,7 +173,7 @@ Film::info_dir () const
 {
        boost::filesystem::path p;
        p /= "info";
-       p /= video_state_identifier ();
+       p /= video_identifier ();
        return dir (p.string());
 }
 
@@ -186,7 +186,7 @@ Film::internal_video_mxf_dir () const
 string
 Film::internal_video_mxf_filename () const
 {
-       return video_state_identifier() + ".mxf";
+       return video_identifier() + ".mxf";
 }
 
 string
@@ -625,6 +625,16 @@ Film::set_dcp_video_frame_rate (int f)
        signal_changed (DCP_VIDEO_FRAME_RATE);
 }
 
+void
+Film::set_dcp_audio_channels (int c)
+{
+       {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               _dcp_audio_channels = c;
+       }
+       signal_changed (DCP_AUDIO_CHANNELS);
+}
+
 void
 Film::signal_changed (Property p)
 {
@@ -675,7 +685,7 @@ Film::j2c_path (int f, bool t) const
 {
        boost::filesystem::path p;
        p /= "j2c";
-       p /= video_state_identifier ();
+       p /= video_identifier ();
 
        stringstream s;
        s.width (8);