Allow content parts to not be preset in XML.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 3aa9678b01119f5e3499ea94bc7c83e5ca103376..e196e15c208e6573441c8c3de736c1d31089e4a3 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -34,44 +34,39 @@
 class AudioContentProperty
 {
 public:
-       static int const AUDIO_STREAMS;
-       static int const AUDIO_GAIN;
-       static int const AUDIO_DELAY;
-       static int const AUDIO_VIDEO_FRAME_RATE;
+       static int const STREAMS;
+       static int const GAIN;
+       static int const DELAY;
 };
 
 class AudioContent : public ContentPart
 {
 public:
        AudioContent (Content* parent, boost::shared_ptr<const Film>);
-       AudioContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
        AudioContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
 
-       AudioMapping audio_mapping () const;
-       void set_audio_mapping (AudioMapping);
-       int resampled_audio_frame_rate () const;
+       AudioMapping mapping () const;
+       void set_mapping (AudioMapping);
+       int resampled_frame_rate () const;
        bool has_rate_above_48k () const;
-       std::vector<std::string> audio_channel_names () const;
+       std::vector<std::string> channel_names () const;
 
-       void set_audio_gain (double);
-       void set_audio_delay (int);
+       void set_gain (double);
+       void set_delay (int);
 
-       double audio_gain () const {
+       double gain () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _audio_gain;
+               return _gain;
        }
 
-       int audio_delay () const {
+       int delay () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _audio_delay;
+               return _delay;
        }
 
-       double audio_video_frame_rate () const;
-       void set_audio_video_frame_rate (double r);
-
        std::string processing_description () const;
 
        std::vector<AudioStreamPtr> streams () const {
@@ -86,13 +81,16 @@ public:
 
        void add_properties (std::list<UserProperty> &) const;
 
+       static boost::shared_ptr<AudioContent> from_xml (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+
 private:
 
+       AudioContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+
        /** Gain to apply to audio in dB */
-       double _audio_gain;
+       double _gain;
        /** Delay to apply to audio (positive moves audio later) in milliseconds */
-       int _audio_delay;
-       boost::optional<double> _audio_video_frame_rate;
+       int _delay;
        std::vector<AudioStreamPtr> _streams;
 };