FFmpegContent does not need audio_length().

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index da78e6d72a5cc0bd22f7f111c875013d41609ee3..9365a6e2c3bb8bc0fa612efac67c2b645c44610a 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -24,12 +24,12 @@
  *  @brief DCPContent class.
  */
 
-#include <libcxml/cxml.h>
-#include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 #include "video_content.h"
 #include "single_stream_audio_content.h"
 #include "subtitle_content.h"
+#include <libcxml/cxml.h>
+#include <dcp/encrypted_kdm.h>
+#include <dcp/decrypted_kdm.h>
 
 class DCPContentProperty
 {
@@ -64,10 +64,7 @@ public:
                return _has_subtitles;
        }
        
-       boost::filesystem::path directory () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _directory;
-       }
+       boost::filesystem::path directory () const;
 
        bool encrypted () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -89,7 +86,6 @@ private:
        bool _has_subtitles;
        /** true if our DCP is encrypted */
        bool _encrypted;
-       boost::filesystem::path _directory;
        boost::optional<dcp::EncryptedKDM> _kdm;
        /** true if _kdm successfully decrypts the first frame of our DCP */
        bool _kdm_valid;