Another try at sorting out the thorny question of timing.

[dcpomatic.git] / src / lib / sndfile_content.h

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 17423b8edd76acd053f34568190a2629a220218d..876d66088c6f7a5a84f4b289de622d43256d1d97 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -51,7 +49,7 @@ public:
                return _audio_channels;
        }
        
-        ContentAudioFrame audio_length () const {
+        AudioContent::Frame audio_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_length;
        }
@@ -67,12 +65,14 @@ public:
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_mapping;
        }
+
+       void set_audio_mapping (AudioMapping);
        
        static bool valid_file (boost::filesystem::path);
 
 private:
        int _audio_channels;
-       ContentAudioFrame _audio_length;
+       AudioContent::Frame _audio_length;
        int _audio_frame_rate;
        AudioMapping _audio_mapping;
 };