No-op: remove all trailing whitespace.

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

diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h
index b3b203b39aa667b46ad747a39a4d2c79dd9bcefa..80ccc4cdba0935c138820fef3cc9aad87044235a 100644 (file)
--- a/src/lib/audio_stream.h
+++ b/src/lib/audio_stream.h
@@ -23,27 +23,22 @@
 #include "audio_mapping.h"
 #include <boost/thread/mutex.hpp>
 
-class audio_sampling_rate_test;
+struct audio_sampling_rate_test;
 
 class AudioStream
 {
 public:
        AudioStream (int frame_rate, int channels);
        AudioStream (int frame_rate, AudioMapping mapping);
-       
+
        void set_mapping (AudioMapping mapping);
        void set_frame_rate (int frame_rate);
 
-       AudioMapping const & mapping () const {
+       AudioMapping mapping () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _mapping;
        }
 
-       AudioMapping & mapping () {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _mapping;
-       }
-       
        int frame_rate () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _frame_rate;
@@ -55,8 +50,8 @@ protected:
        mutable boost::mutex _mutex;
 
 private:
-       friend class audio_sampling_rate_test;
-       
+       friend struct audio_sampling_rate_test;
+
        int _frame_rate;
        AudioMapping _mapping;
 };