Assorted tidying.

diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 77c9b0695a3d7b6f4c7d3b57df84193e017863eb..2d02043b5948d1071d0de18982e14abfcf03c12e 100644 (file)
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -32,8 +32,6 @@
 
 
 using std::cout;
-using std::map;
-using std::pair;
 using std::shared_ptr;
 using std::make_shared;
 using boost::optional;

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 754321880bcb026c7af361f6ff642eea350ea3f0..81b48b73cb7ff7aaafcf8a86ff18a4bea28fa744 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,9 +28,9 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 
-#include "decoder.h"
-#include "content_audio.h"
 #include "audio_stream.h"
+#include "content_audio.h"
+#include "decoder.h"
 #include "decoder_part.h"
 #include <boost/signals2.hpp>
 

diff --git a/src/lib/audio_stream.cc b/src/lib/audio_stream.cc
index ef0b9166514637e230d30ec339b7946c000dd3b3..43e4c5ec13d924fe4baef0e2981c4167c500673f 100644 (file)
--- a/src/lib/audio_stream.cc
+++ b/src/lib/audio_stream.cc
@@ -18,10 +18,12 @@
 
 */
 
+
 #include "audio_stream.h"
 #include "audio_mapping.h"
 #include "util.h"
 
+
 AudioStream::AudioStream (int frame_rate, Frame length, int channels)
        : _frame_rate (frame_rate)
        , _length (length)
@@ -30,6 +32,7 @@ AudioStream::AudioStream (int frame_rate, Frame length, int channels)
 
 }
 
+
 AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)
        : _frame_rate (frame_rate)
        , _length (length)
@@ -38,6 +41,7 @@ AudioStream::AudioStream (int frame_rate, Frame length, AudioMapping mapping)
 
 }
 
+
 void
 AudioStream::set_mapping (AudioMapping mapping)
 {
@@ -45,6 +49,7 @@ AudioStream::set_mapping (AudioMapping mapping)
        _mapping = mapping;
 }
 
+
 int
 AudioStream::channels () const
 {

diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h
index a7e204065432c4a33e011a69e594e228e7efc2c6..470d9c854a5acf34b1e91f4053560af4babff69e 100644 (file)
--- a/src/lib/audio_stream.h
+++ b/src/lib/audio_stream.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,13 +18,16 @@
 
 */
 
+
 #ifndef DCPOMATIC_AUDIO_STREAM_H
 #define DCPOMATIC_AUDIO_STREAM_H
 
+
 #include "audio_mapping.h"
 #include "types.h"
 #include <boost/thread/mutex.hpp>
 
+
 struct audio_sampling_rate_test;
 
 class AudioStream
@@ -65,6 +68,8 @@ private:
        AudioMapping _mapping;
 };
 
+
 typedef std::shared_ptr<AudioStream> AudioStreamPtr;
 
+
 #endif