X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=9bf53e0ab4d044ac379c6f45decd7d00ba4f932f;hb=1b3e9b80e4940ccf218062fd5dc907c6079ba249;hp=e18d1082e9d6d1202d7ae0aa92126525ae76c9b0;hpb=127672223cca569986e35c91265e269ed5a6561c;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index e18d1082e..9bf53e0ab 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,19 +1,83 @@
-#ifndef DVDOMATIC_AUDIO_CONTENT_H
-#define DVDOMATIC_AUDIO_CONTENT_H
+/*
+    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#ifndef DCPOMATIC_AUDIO_CONTENT_H
+#define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
+#include "audio_mapping.h"
+
+namespace cxml {
+	class Node;
+}
+
+class AudioContentProperty
+{
+public:
+	static int const AUDIO_CHANNELS;
+	static int const AUDIO_LENGTH;
+	static int const AUDIO_FRAME_RATE;
+	static int const AUDIO_GAIN;
+	static int const AUDIO_DELAY;
+	static int const AUDIO_MAPPING;
+};
 
 class AudioContent : public virtual Content
 {
 public:
-	AudioContent (boost::filesystem::path);
+	typedef int64_t Frame;
+	
+	AudioContent (boost::shared_ptr<const Film>, Time);
+	AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
+	AudioContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
+	AudioContent (AudioContent const &);
+
+	void as_xml (xmlpp::Node *) const;
 
         virtual int audio_channels () const = 0;
-        virtual ContentAudioFrame audio_length () const = 0;
-        virtual int audio_frame_rate () const = 0;
-        virtual int64_t audio_channel_layout () const = 0;
+        virtual AudioContent::Frame audio_length () const = 0;
+        virtual int content_audio_frame_rate () const = 0;
+	virtual int output_audio_frame_rate () const = 0;
+	virtual AudioMapping audio_mapping () const = 0;
+	virtual void set_audio_mapping (AudioMapping) = 0;
+
+	void analyse_audio (boost::function<void()>);
+	boost::filesystem::path audio_analysis_path () const;
+
+	void set_audio_gain (float);
+	void set_audio_delay (int);
 	
+	float audio_gain () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_gain;
+	}
+
+	int audio_delay () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _audio_delay;
+	}
+
+private:
+	/** Gain to apply to audio in dB */
+	float _audio_gain;
+	/** Delay to apply to audio (positive moves audio later) in milliseconds */
+	int _audio_delay;
 };
 
 #endif