Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework...

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index d5dbf266bb6c5db616cb561220c59a0a830ac421..2362786d951cc8c25eebcf23b958a5db3ccca88d 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_CONTENT_H
-#define DVDOMATIC_AUDIO_CONTENT_H
+#ifndef DCPOMATIC_AUDIO_CONTENT_H
+#define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
@@ -45,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