pot/merge.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 82c95a513a3ca475d7d3312551fed1255000aeba..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
@@ -37,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
@@ -75,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