Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 051fc8db8941f137fdd54d90f457dd709204aa42..504c2aecfffde3b2719eff1789babcd3639a010a 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -53,7 +53,6 @@ public:
        AudioMapping mapping () const;
        void set_mapping (AudioMapping);
        int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
-       bool has_rate_above_48k () const;
        std::vector<std::string> channel_names () const;
 
        void set_gain (double);
@@ -83,8 +82,8 @@ public:
 
        void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
-       void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
-       void modify_trim_start (ContentTime& pos) const;
+       void modify_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+       void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
        static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);