Merge pull request #352 from ferdnyc/clang-iwyu-fixes

Add fixes for Clang/IWYU building, correct juce:: namespacing

Author: jonoomph

include/AudioBufferSource.h

@@ -54,25 +54,25 @@ namespace openshot
 	 * The <a href="http://www.juce.com/">JUCE</a> library cannot play audio directly from an AudioSampleBuffer, so this class exposes
 	 * an AudioSampleBuffer as a AudioSource, so that JUCE can play the audio.
 	 */
-	class AudioBufferSource : public PositionableAudioSource
+	class AudioBufferSource : public juce::PositionableAudioSource
 	{
 	private:
 		int position;
 		int start;
 		bool repeat;
-		AudioSampleBuffer *buffer;
+		juce::AudioSampleBuffer *buffer;
 
 	public:
 		/// @brief Default constructor
 		/// @param audio_buffer This buffer contains the samples you want to play through JUCE.
-		AudioBufferSource(AudioSampleBuffer *audio_buffer);
+		AudioBufferSource(juce::AudioSampleBuffer *audio_buffer);
 
 		/// Destructor
 		~AudioBufferSource();
 
 		/// @brief Get the next block of audio samples
 		/// @param info This struct informs us of which samples are needed next.
-		void getNextAudioBlock (const AudioSourceChannelInfo& info);
+		void getNextAudioBlock (const juce::AudioSourceChannelInfo& info);
 
 		/// Prepare to play this audio source
 		void prepareToPlay(int, double);
@@ -82,13 +82,13 @@ namespace openshot
 
 		/// @brief Set the next read position of this source
 		/// @param newPosition The sample # to start reading from
-		void setNextReadPosition (int64 newPosition);
+		void setNextReadPosition (juce::int64 newPosition);
 
 		/// Get the next read position of this source
-		int64 getNextReadPosition() const;
+		juce::int64 getNextReadPosition() const;
 
 		/// Get the total length (in samples) of this audio source
-		int64 getTotalLength() const;
+		juce::int64 getTotalLength() const;
 
 		/// Determines if this audio source should repeat when it reaches the end
 		bool isLooping() const;
@@ -98,7 +98,7 @@ namespace openshot
 		void setLooping (bool shouldLoop);
 
 		/// Update the internal buffer used by this source
-		void setBuffer (AudioSampleBuffer *audio_buffer);
+		void setBuffer (juce::AudioSampleBuffer *audio_buffer);
 	};
 
 }

include/AudioReaderSource.h

@@ -54,13 +54,13 @@ namespace openshot
 	 *
 	 * This allows any reader to play audio through JUCE (our audio framework).
 	 */
-	class AudioReaderSource : public PositionableAudioSource
+	class AudioReaderSource : public juce::PositionableAudioSource
 	{
 	private:
 		int position; /// The position of the audio source (index of buffer)
 		bool repeat; /// Repeat the audio source when finished
 		int size; /// The size of the internal buffer
-		AudioSampleBuffer *buffer; /// The audio sample buffer
+		juce::AudioSampleBuffer *buffer; /// The audio sample buffer
 		int speed; /// The speed and direction to playback a reader (1=normal, 2=fast, 3=faster, -1=rewind, etc...)
 
 		ReaderBase *reader; /// The reader to pull samples from
@@ -90,7 +90,7 @@ namespace openshot
 
 		/// @brief Get the next block of audio samples
 		/// @param info This struct informs us of which samples are needed next.
-		void getNextAudioBlock (const AudioSourceChannelInfo& info);
+		void getNextAudioBlock (const juce::AudioSourceChannelInfo& info);
 
 		/// Prepare to play this audio source
 		void prepareToPlay(int, double);
@@ -100,13 +100,13 @@ namespace openshot
 
 		/// @brief Set the next read position of this source
 		/// @param newPosition The sample # to start reading from
-		void setNextReadPosition (int64 newPosition);
+		void setNextReadPosition (juce::int64 newPosition);
 
 		/// Get the next read position of this source
-		int64 getNextReadPosition() const;
+		juce::int64 getNextReadPosition() const;
 
 		/// Get the total length (in samples) of this audio source
-		int64 getTotalLength() const;
+		juce::int64 getTotalLength() const;
 
 		/// Determines if this audio source should repeat when it reaches the end
 		bool isLooping() const;
@@ -116,7 +116,7 @@ namespace openshot
 		void setLooping (bool shouldLoop);
 
 		/// Update the internal buffer used by this source
-		void setBuffer (AudioSampleBuffer *audio_buffer);
+		void setBuffer (juce::AudioSampleBuffer *audio_buffer);
 
 	    const ReaderInfo & getReaderInfo() const { return reader->info; }
 

include/AudioResampler.h

@@ -55,11 +55,11 @@ namespace openshot {
 	 */
 	class AudioResampler {
 	private:
-		AudioSampleBuffer *buffer;
-		AudioSampleBuffer *resampled_buffer;
+		juce::AudioSampleBuffer *buffer;
+		juce::AudioSampleBuffer *resampled_buffer;
 		AudioBufferSource *buffer_source;
-		ResamplingAudioSource *resample_source;
-		AudioSourceChannelInfo resample_callback_buffer;
+		juce::ResamplingAudioSource *resample_source;
+		juce::AudioSourceChannelInfo resample_callback_buffer;
 
 		int num_of_samples;
 		int new_num_of_samples;
@@ -78,15 +78,15 @@ namespace openshot {
 		/// @param new_buffer The buffer of audio samples needing to be resampled
 		/// @param sample_rate The original sample rate of the buffered samples
 		/// @param new_sample_rate The requested sample rate you need
-		void SetBuffer(AudioSampleBuffer *new_buffer, double sample_rate, double new_sample_rate);
+		void SetBuffer(juce::AudioSampleBuffer *new_buffer, double sample_rate, double new_sample_rate);
 
 		/// @brief Sets the audio buffer and key settings
 		/// @param new_buffer The buffer of audio samples needing to be resampled
 		/// @param ratio The multiplier that needs to be applied to the sample rate (this is how resampling happens)
-		void SetBuffer(AudioSampleBuffer *new_buffer, double ratio);
+		void SetBuffer(juce::AudioSampleBuffer *new_buffer, double ratio);
 
 		/// Get the resampled audio buffer
-		AudioSampleBuffer* GetResampledBuffer();
+		juce::AudioSampleBuffer* GetResampledBuffer();
 	};
 
 }

include/CacheBase.h

@@ -53,7 +53,7 @@ namespace openshot {
 		int64_t max_bytes; ///< This is the max number of bytes to cache (0 = no limit)
 
 		/// Section lock for multiple threads
-	    CriticalSection *cacheCriticalSection;
+	    juce::CriticalSection *cacheCriticalSection;
 
 
 	public:

include/Clip.h

@@ -103,15 +103,15 @@ namespace openshot {
 	class Clip : public ClipBase {
 	protected:
 		/// Section lock for multiple threads
-	    CriticalSection getFrameCriticalSection;
+	    juce::CriticalSection getFrameCriticalSection;
 
 	private:
 		bool waveform; ///< Should a waveform be used instead of the clip's image
-		list<EffectBase*> effects; ///<List of clips on this timeline
+		std::list<EffectBase*> effects; ///<List of clips on this timeline
 
 		// Audio resampler (if time mapping)
 		AudioResampler *resampler;
-		AudioSampleBuffer *audio_cache;
+		juce::AudioSampleBuffer *audio_cache;
 
 		// File Reader object
 		ReaderBase* reader;
@@ -127,7 +127,7 @@ namespace openshot {
 		std::shared_ptr<Frame> apply_effects(std::shared_ptr<Frame> frame);
 
 		/// Get file extension
-		string get_file_extension(string path);
+		std::string get_file_extension(std::string path);
 
 		/// Get a frame object or create a blank one
 		std::shared_ptr<Frame> GetOrCreateFrame(int64_t number);

include/Frame.h

@@ -119,8 +119,8 @@ namespace openshot
 		std::shared_ptr<QImage> wave_image;
 		std::shared_ptr<juce::AudioSampleBuffer> audio;
 		std::shared_ptr<QApplication> previewApp;
-		CriticalSection addingImageSection;
-        CriticalSection addingAudioSection;
+		juce::CriticalSection addingImageSection;
+        juce::CriticalSection addingAudioSection;
 		const unsigned char *qbuffer;
 		Fraction pixel_ratio;
 		int channels;

include/ReaderBase.h

@@ -100,8 +100,8 @@ namespace openshot
 	{
 	protected:
 		/// Section lock for multiple threads
-	    CriticalSection getFrameCriticalSection;
-	    CriticalSection processingCriticalSection;
+	    juce::CriticalSection getFrameCriticalSection;
+	    juce::CriticalSection processingCriticalSection;
 		ClipBase* parent;
 
 	public:

include/ZmqLogger.h

@@ -55,7 +55,7 @@ namespace openshot {
 	 */
 	class ZmqLogger {
 	private:
-		CriticalSection loggerCriticalSection;
+		juce::CriticalSection loggerCriticalSection;
 		std::string connection;
 
 		// Logfile related vars

src/AudioBufferSource.cpp

@@ -34,7 +34,7 @@ using namespace std;
 using namespace openshot;
 
 // Default constructor
-AudioBufferSource::AudioBufferSource(AudioSampleBuffer *audio_buffer)
+AudioBufferSource::AudioBufferSource(juce::AudioSampleBuffer *audio_buffer)
 		: position(0), start(0), repeat(false), buffer(audio_buffer)
 { }
 
@@ -46,7 +46,7 @@ AudioBufferSource::~AudioBufferSource()
 };
 
 // Get the next block of audio samples
-void AudioBufferSource::getNextAudioBlock (const AudioSourceChannelInfo& info)
+void AudioBufferSource::getNextAudioBlock (const juce::AudioSourceChannelInfo& info)
 {
 	int buffer_samples = buffer->getNumSamples();
 	int buffer_channels = buffer->getNumChannels();
@@ -98,22 +98,22 @@ void AudioBufferSource::prepareToPlay(int, double) { }
 void AudioBufferSource::releaseResources() { }
 
 // Set the next read position of this source
-void AudioBufferSource::setNextReadPosition (int64 newPosition)
+void AudioBufferSource::setNextReadPosition (juce::int64 newPosition)
 {
 	// set position (if the new position is in range)
 	if (newPosition >= 0 && newPosition < buffer->getNumSamples())
 		position = newPosition;
 }
 
 // Get the next read position of this source
-int64 AudioBufferSource::getNextReadPosition() const
+juce::int64 AudioBufferSource::getNextReadPosition() const
 {
 	// return the next read position
 	return position;
 }
 
 // Get the total length (in samples) of this audio source
-int64 AudioBufferSource::getTotalLength() const
+juce::int64 AudioBufferSource::getTotalLength() const
 {
 	// Get the length
 	return buffer->getNumSamples();
@@ -134,7 +134,7 @@ void AudioBufferSource::setLooping (bool shouldLoop)
 }
 
 // Use a different AudioSampleBuffer for this source
-void AudioBufferSource::setBuffer (AudioSampleBuffer *audio_buffer)
+void AudioBufferSource::setBuffer (juce::AudioSampleBuffer *audio_buffer)
 {
 	buffer = audio_buffer;
 	setNextReadPosition(0);

src/AudioReaderSource.cpp

@@ -152,7 +152,7 @@ juce::AudioSampleBuffer* AudioReaderSource::reverse_buffer(juce::AudioSampleBuff
 	ZmqLogger::Instance()->AppendDebugMethod("AudioReaderSource::reverse_buffer", "number_of_samples", number_of_samples, "channels", channels);
 
 	// Reverse array (create new buffer to hold the reversed version)
-	AudioSampleBuffer *reversed = new juce::AudioSampleBuffer(channels, number_of_samples);
+	juce::AudioSampleBuffer *reversed = new juce::AudioSampleBuffer(channels, number_of_samples);
 	reversed->clear();
 
 	for (int channel = 0; channel < channels; channel++)
@@ -177,7 +177,7 @@ juce::AudioSampleBuffer* AudioReaderSource::reverse_buffer(juce::AudioSampleBuff
 }
 
 // Get the next block of audio samples
-void AudioReaderSource::getNextAudioBlock(const AudioSourceChannelInfo& info)
+void AudioReaderSource::getNextAudioBlock(const juce::AudioSourceChannelInfo& info)
 {
 	int buffer_samples = buffer->getNumSamples();
 	int buffer_channels = buffer->getNumChannels();
@@ -248,22 +248,22 @@ void AudioReaderSource::prepareToPlay(int, double) { }
 void AudioReaderSource::releaseResources() { }
 
 // Set the next read position of this source
-void AudioReaderSource::setNextReadPosition (int64 newPosition)
+void AudioReaderSource::setNextReadPosition (juce::int64 newPosition)
 {
 	// set position (if the new position is in range)
 	if (newPosition >= 0 && newPosition < buffer->getNumSamples())
 		position = newPosition;
 }
 
 // Get the next read position of this source
-int64 AudioReaderSource::getNextReadPosition() const
+juce::int64 AudioReaderSource::getNextReadPosition() const
 {
 	// return the next read position
 	return position;
 }
 
 // Get the total length (in samples) of this audio source
-int64 AudioReaderSource::getTotalLength() const
+juce::int64 AudioReaderSource::getTotalLength() const
 {
 	// Get the length
 	if (reader)
@@ -287,7 +287,7 @@ void AudioReaderSource::setLooping (bool shouldLoop)
 }
 
 // Update the internal buffer used by this source
-void AudioReaderSource::setBuffer (AudioSampleBuffer *audio_buffer)
+void AudioReaderSource::setBuffer (juce::AudioSampleBuffer *audio_buffer)
 {
 	buffer = audio_buffer;
 	setNextReadPosition(0);