X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_merger.h;h=d5a6ec43ad80ecd233049a971b813f8295785e33;hp=6c9d87097c6fc4458706317338f3dac426d863d8;hb=1befa3d286a5016e897f1a23cc60cd3d3b96e63a;hpb=27d63cb95a5cbe2c58f45717e9482f3395a896fb

diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 6c9d87097..d5a6ec43a 100644
--- a/src/lib/audio_merger.h
+++ b/src/lib/audio_merger.h
@@ -31,14 +31,14 @@
 class AudioMerger
 {
 public:
-	AudioMerger (int frame_rate);
+	explicit AudioMerger (int frame_rate);
 
-	std::list<std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> > pull (DCPTime time);
-	void push (boost::shared_ptr<const AudioBuffers> audio, DCPTime time);
+	std::list<std::pair<boost::shared_ptr<AudioBuffers>, dcpomatic::DCPTime> > pull (dcpomatic::DCPTime time);
+	void push (boost::shared_ptr<const AudioBuffers> audio, dcpomatic::DCPTime time);
 	void clear ();
 
 private:
-	Frame frames (DCPTime t) const;
+	Frame frames (dcpomatic::DCPTime t) const;
 
 	class Buffer
 	{
@@ -48,24 +48,24 @@ private:
 		 *  @param t Time
 		 *  @param r Frame rate.
 		 */
-		Buffer (int c, int32_t f, DCPTime t, int r)
+		Buffer (int c, int32_t f, dcpomatic::DCPTime t, int r)
 			: audio (new AudioBuffers (c, f))
 			, time (t)
 			, frame_rate (r)
 		{}
 
-		Buffer (boost::shared_ptr<AudioBuffers> a, DCPTime t, int r)
+		Buffer (boost::shared_ptr<AudioBuffers> a, dcpomatic::DCPTime t, int r)
 			: audio (a)
 			, time (t)
 			, frame_rate (r)
 		{}
 
 		boost::shared_ptr<AudioBuffers> audio;
-		DCPTime time;
+		dcpomatic::DCPTime time;
 		int frame_rate;
 
-		DCPTimePeriod period () const {
-			return DCPTimePeriod (time, time + DCPTime::from_frames (audio->frames(), frame_rate));
+		dcpomatic::DCPTimePeriod period () const {
+			return dcpomatic::DCPTimePeriod (time, time + dcpomatic::DCPTime::from_frames (audio->frames(), frame_rate));
 		}
 	};