Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index fe1795bd0d2d2b4da589647ccb83c3d622612e18..0aa08e42586c38c6b451ba650e6bd820110e3b37 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -30,7 +30,6 @@
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
-#include "ratio.h"
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
@@ -40,6 +39,10 @@
 #include <vector>
 #include <inttypes.h>
 
+namespace xmlpp {
+       class Document;
+}
+
 class DCPContentType;
 class Log;
 class Content;
@@ -49,6 +52,9 @@ class AudioContent;
 class Screen;
 class AudioProcessor;
 class AudioMapping;
+class Ratio;
+class Job;
+class ScreenKDM;
 struct isdcf_name_test;
 
 /** @class Film
@@ -69,7 +75,7 @@ public:
        boost::filesystem::path internal_video_asset_dir () const;
        boost::filesystem::path internal_video_asset_filename () const;
 
-       boost::filesystem::path audio_analysis_path () const;
+       boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
        void send_dcp_to_tms ();
        void make_dcp ();
@@ -122,7 +128,7 @@ public:
                dcp::Formulation formulation
                ) const;
 
-       std::list<dcp::EncryptedKDM> make_kdms (
+       std::list<ScreenKDM> make_kdms (
                std::list<boost::shared_ptr<Screen> >,
                boost::filesystem::path cpl_file,
                dcp::LocalTime from,
@@ -141,6 +147,10 @@ public:
 
        void repeat_content (ContentList, int);
 
+       boost::shared_ptr<const Playlist> playlist () const {
+               return _playlist;
+       }
+
        /** Identifiers for the parts of our state;
            used for signalling changes.
        */
@@ -287,6 +297,7 @@ private:
        void playlist_changed ();
        void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
        void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
+       void audio_analysis_finished ();
 
        /** Log to write to */
        boost::shared_ptr<Log> _log;
@@ -336,6 +347,7 @@ private:
        boost::signals2::scoped_connection _playlist_changed_connection;
        boost::signals2::scoped_connection _playlist_content_changed_connection;
        std::list<boost::signals2::connection> _job_connections;
+       std::list<boost::signals2::connection> _audio_analysis_connections;
 
        friend struct paths_test;
        friend struct film_metadata_test;