pot/merge.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 63ce3d0fa420f84048005d6ce52f5d624fb487da..ac91da595655dcb49382904182656c78d3f8e193 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -28,10 +28,6 @@
 #include "audio_stream.h"
 #include "audio_mapping.h"
 
-namespace cxml {
-       class Node;
-}
-
 /** @class AudioContentProperty
  *  @brief Names for properties of AudioContent.
  */
@@ -41,6 +37,7 @@ public:
        static int const AUDIO_STREAMS;
        static int const AUDIO_GAIN;
        static int const AUDIO_DELAY;
+       static int const AUDIO_VIDEO_FRAME_RATE;
 };
 
 /** @class AudioContent
@@ -62,16 +59,13 @@ public:
 
        AudioMapping audio_mapping () const;
        void set_audio_mapping (AudioMapping);
-       boost::filesystem::path audio_analysis_path () const;
        int resampled_audio_frame_rate () const;
        bool has_rate_above_48k () const;
        std::vector<std::string> audio_channel_names () const;
 
-       boost::signals2::connection analyse_audio (boost::function<void()>);
-
        void set_audio_gain (double);
        void set_audio_delay (int);
-       
+
        double audio_gain () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_gain;
@@ -82,13 +76,21 @@ public:
                return _audio_delay;
        }
 
+       double audio_video_frame_rate () const;
+       void set_audio_video_frame_rate (double r);
+
        std::string processing_description () const;
-       
+
+protected:
+
+       void add_properties (std::list<UserProperty> &) const;
+
 private:
        /** Gain to apply to audio in dB */
        double _audio_gain;
        /** Delay to apply to audio (positive moves audio later) in milliseconds */
        int _audio_delay;
+       boost::optional<double> _audio_video_frame_rate;
 };
 
 #endif