Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

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

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index 5e455d18aa086f26d6ae9a644d07c2b5005ac0f5..1587afcae4528a8f979e92aeaedd111b7aa4c08e 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -21,37 +21,54 @@
 #include "audio_mapping.h"
 #include "dcpomatic_time.h"
 
-class ffmpeg_pts_offset_test;
+struct ffmpeg_pts_offset_test;
 
 class FFmpegAudioStream : public FFmpegStream
 {
 public:
        FFmpegAudioStream (std::string n, int i, int f, int c)
                : FFmpegStream (n, i)
-               , frame_rate (f)
-               , channels (c)
-               , mapping (c)
+               , _frame_rate (f)
+               , _channels (c)
+               , _mapping (c)
        {
-               mapping.make_default ();
+               _mapping.make_default ();
        }
 
        FFmpegAudioStream (cxml::ConstNodePtr, int);
 
        void as_xml (xmlpp::Node *) const;
 
-       int frame_rate;
-       int channels;
-       AudioMapping mapping;
+       int frame_rate () const {
+               return _frame_rate;
+       }
+       
+       int channels () const {
+               return _channels;
+       }
+       
+       AudioMapping mapping () const {
+               return _mapping;
+       }
+
+       void set_mapping (AudioMapping m) {
+               _mapping = m;
+       }
+       
        boost::optional<ContentTime> first_audio;
 
 private:
-       friend class ffmpeg_pts_offset_test;
+       friend struct ffmpeg_pts_offset_test;
 
        /* Constructor for tests */
        FFmpegAudioStream ()
                : FFmpegStream ("", 0)
-               , frame_rate (0)
-               , channels (0)
-               , mapping (1)
+               , _frame_rate (0)
+               , _channels (0)
+               , _mapping (1)
        {}
+
+       int _frame_rate;
+       int _channels;
+       AudioMapping _mapping;
 };