Merge branch 'master' into 1.0

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 24391b01c68251dc10784f8237b18f267d2dd15d..2362786d951cc8c25eebcf23b958a5db3ccca88d 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,24 @@
-#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"
@@ -8,6 +27,14 @@ namespace cxml {
        class Node;
 }
 
+class AudioContentProperty
+{
+public:
+       static int const AUDIO_CHANNELS;
+       static int const AUDIO_LENGTH;
+       static int const AUDIO_FRAME_RATE;
+};
+
 class AudioContent : public virtual Content
 {
 public:
@@ -18,8 +45,6 @@ public:
         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;
-       
 };
 
 #endif