Another macOS std::list boost::thread SNAFU.

[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 7fe3c4fdaedd907df31ecdf5d06360eb8b41f43a..65c4aba5ead97b8459925bc63fc4b25c5e6366bd 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -1,24 +1,24 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "ffmpeg_stream.h"
-#include "audio_mapping.h"
 #include "audio_stream.h"
 #include "dcpomatic_time.h"
 
@@ -27,9 +27,20 @@ struct ffmpeg_pts_offset_test;
 class FFmpegAudioStream : public FFmpegStream, public AudioStream
 {
 public:
-       FFmpegAudioStream (std::string name, int id, int frame_rate, int channels)
+       FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, int channels)
+               : FFmpegStream (name, id)
+               , AudioStream (frame_rate, length, channels)
+       {}
+
+       FFmpegAudioStream (std::string name, std::string codec_name_, int id, int frame_rate, Frame length, int channels)
                : FFmpegStream (name, id)
-               , AudioStream (frame_rate, channels)
+               , AudioStream (frame_rate, length, channels)
+               , codec_name (codec_name_)
+       {}
+
+       FFmpegAudioStream (std::string name, int id, int frame_rate, Frame length, AudioMapping mapping)
+               : FFmpegStream (name, id)
+               , AudioStream (frame_rate, length, mapping)
        {}
 
        FFmpegAudioStream (cxml::ConstNodePtr, int);
@@ -37,8 +48,9 @@ public:
        void as_xml (xmlpp::Node *) const;
 
        /* XXX: should probably be locked */
-       
-       boost::optional<ContentTime> first_audio;
+
+       boost::optional<dcpomatic::ContentTime> first_audio;
+       boost::optional<std::string> codec_name;
 
 private:
        friend struct ffmpeg_pts_offset_test;
@@ -46,6 +58,6 @@ private:
        /* Constructor for tests */
        FFmpegAudioStream ()
                : FFmpegStream ("", 0)
-               , AudioStream (0, 0)
+               , AudioStream (0, 0, 0)
        {}
 };