Fix checking of frame channels vs stream channels.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index adb5c9556151e0aa02d876374042e8b6cd3f2b8b..82a9de04171ef85a6719f6e229c0451ab7088657 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -31,7 +31,6 @@
 #include "content_part.h"
 #include "audio_stream.h"
 #include "audio_mapping.h"
-#include <dcp/language_tag.h>
 
 
 /** @class AudioContentProperty
@@ -43,7 +42,9 @@ public:
        static int const STREAMS;
        static int const GAIN;
        static int const DELAY;
-       static int const LANGUAGE;
+       static int const FADE_IN;
+       static int const FADE_OUT;
+       static int const USE_SAME_FADES_AS_VIDEO;
 };
 
 
@@ -63,9 +64,10 @@ public:
        int resampled_frame_rate (std::shared_ptr<const Film> film) const;
        std::vector<NamedChannel> channel_names () const;
 
+       /** Set gain in dB */
        void set_gain (double);
+       /** Set delay in milliseconds (positive moves audio later) */
        void set_delay (int);
-       void set_language (boost::optional<dcp::LanguageTag> langauge);
 
        double gain () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -77,10 +79,12 @@ public:
                return _delay;
        }
 
-       boost::optional<dcp::LanguageTag> language () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _language;
-       }
+       dcpomatic::ContentTime fade_in () const;
+       dcpomatic::ContentTime fade_out () const;
+
+       void set_fade_in (dcpomatic::ContentTime time);
+       void set_fade_out (dcpomatic::ContentTime time);
+       void set_use_same_fades_as_video (bool s);
 
        std::string processing_description (std::shared_ptr<const Film> film) const;
 
@@ -99,6 +103,13 @@ public:
        void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
        void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
+       /** @param frame frame within the whole (untrimmed) content.
+        *  @param frame_rate The frame rate of the audio (it may have been resampled).
+        *  @return a fade coefficient for @ref length samples starting at an offset @frame within
+        *  the content, or an empty vector if the given section has no fade.
+        */
+       std::vector<float> fade (AudioStreamPtr stream, Frame frame, Frame length, int frame_rate) const;
+
        static std::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
 
 private:
@@ -107,8 +118,10 @@ private:
        double _gain = 0;
        /** Delay to apply to audio (positive moves audio later) in milliseconds */
        int _delay = 0;
+       dcpomatic::ContentTime _fade_in;
+       dcpomatic::ContentTime _fade_out;
+       bool _use_same_fades_as_video = false;
        std::vector<AudioStreamPtr> _streams;
-       boost::optional<dcp::LanguageTag> _language;
 };
 
 #endif