Untested use of Frame for video/audio content lengths.

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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 8203b7ac18d01b4303629ccb7c6f888c18d81ecf..cff5eaed83ebe022707b0c8861b9203ae027d4cc 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -56,18 +56,20 @@ public:
                return boost::dynamic_pointer_cast<FFmpegContent> (Content::shared_from_this ());
        }
        
-       void examine (boost::shared_ptr<Job>, bool calculate_digest);
+       void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
-       std::string information () const;
        void as_xml (xmlpp::Node *) const;
        DCPTime full_length () const;
 
        std::string identifier () const;
+
+       /* VideoContent */
+       void set_default_colour_conversion ();
        
        /* AudioContent */
        int audio_channels () const;
-       ContentTime audio_length () const;
+       Frame audio_length () const;
        int audio_frame_rate () const;
        AudioMapping audio_mapping () const;
        void set_audio_mapping (AudioMapping);