tabs -> spaces.

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

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index 17423b8edd76acd053f34568190a2629a220218d..3b61eee64a848253ec6afe439dc778be67beeea4 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 
@@ -19,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SNDFILE_CONTENT_H
+#define DCPOMATIC_SNDFILE_CONTENT_H
+
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
@@ -42,21 +43,20 @@ public:
        std::string summary () const;
        std::string information () const;
        void as_xml (xmlpp::Node *) const;
-       boost::shared_ptr<Content> clone () const;
        Time length () const;
 
-        /* AudioContent */
-        int audio_channels () const {
+       /* AudioContent */
+       int audio_channels () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_channels;
        }
        
-        ContentAudioFrame audio_length () const {
+       AudioContent::Frame audio_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_length;
        }
        
-        int content_audio_frame_rate () const {
+       int content_audio_frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_frame_rate;
        }
@@ -67,12 +67,16 @@ public:
                boost::mutex::scoped_lock lm (_mutex);
                return _audio_mapping;
        }
+
+       void set_audio_mapping (AudioMapping);
        
        static bool valid_file (boost::filesystem::path);
 
 private:
        int _audio_channels;
-       ContentAudioFrame _audio_length;
+       AudioContent::Frame _audio_length;
        int _audio_frame_rate;
        AudioMapping _audio_mapping;
 };
+
+#endif