X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_audio_stream.h;h=65c4aba5ead97b8459925bc63fc4b25c5e6366bd;hp=1587afcae4528a8f979e92aeaedd111b7aa4c08e;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=e491397c0028a80ac4a48a92007f783746553c1a

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index 1587afcae..65c4aba5e 100644
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -1,61 +1,56 @@
 /*
     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"
 
 struct ffmpeg_pts_offset_test;
 
-class FFmpegAudioStream : public FFmpegStream
+class FFmpegAudioStream : public FFmpegStream, public AudioStream
 {
 public:
-	FFmpegAudioStream (std::string n, int i, int f, int c)
-		: FFmpegStream (n, i)
-		, _frame_rate (f)
-		, _channels (c)
-		, _mapping (c)
-	{
-		_mapping.make_default ();
-	}
+	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, 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);
 
 	void as_xml (xmlpp::Node *) const;
 
-	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;
+	/* XXX: should probably be locked */
+
+	boost::optional<dcpomatic::ContentTime> first_audio;
+	boost::optional<std::string> codec_name;
 
 private:
 	friend struct ffmpeg_pts_offset_test;
@@ -63,12 +58,6 @@ private:
 	/* Constructor for tests */
 	FFmpegAudioStream ()
 		: FFmpegStream ("", 0)
-		, _frame_rate (0)
-		, _channels (0)
-		, _mapping (1)
+		, AudioStream (0, 0, 0)
 	{}
-
-	int _frame_rate;
-	int _channels;
-	AudioMapping _mapping;
 };