Use uchardet to guess encoding of subtitle files and reject non-UTF-8.

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

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 57169cc1e7d8c13c21208691d344ec1e8fe2431b..6c7d67203781d14986dfe5406212ad62f643cf14 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -25,18 +25,12 @@
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <libcxml/cxml.h>
-#include <dcp/types.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace xmlpp {
        class Node;
 }
 
-namespace cxml {
-       class Node;
-}
-
 /** @class AudioMapping.
  *  @brief A many-to-many mapping of audio channels.
  */
@@ -48,7 +42,7 @@ public:
        AudioMapping (cxml::ConstNodePtr, int);
 
        /* Default copy constructor is fine */
-       
+
        void as_xml (xmlpp::Node *) const;
 
        void make_zero ();
@@ -63,12 +57,12 @@ public:
        int output_channels () const {
                return _output_channels;
        }
-       
+
        std::string digest () const;
 
        std::list<int> mapped_output_channels () const;
        void unmap_all ();
-       
+
 private:
        void setup (int input_channels, int output_channels);