Add some missing juce:: prefixing

OpenShot · May 19, 2020 · affd4b2 · affd4b2
1 parent 130829a
commit affd4b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/include/Qt/AudioPlaybackThread.h b/include/Qt/AudioPlaybackThread.h
@@ -75,7 +75,7 @@ namespace openshot
 		static AudioDeviceManagerSingleton * Instance();
 
 		/// Public device manager property
-		AudioDeviceManager audioDeviceManager;
+		juce::AudioDeviceManager audioDeviceManager;
 
 		/// Close audio device
 		void CloseAudioDevice();
@@ -86,9 +86,9 @@ namespace openshot
      */
     class AudioPlaybackThread : juce::Thread
     {
-		AudioSourcePlayer player;
-		AudioTransportSource transport;
-		MixerAudioSource mixer;
+		juce::AudioSourcePlayer player;
+		juce::AudioTransportSource transport;
+		juce::MixerAudioSource mixer;
 		AudioReaderSource *source;
 		double sampleRate;
 		int numChannels;

diff --git a/src/Frame.cpp b/src/Frame.cpp
@@ -829,7 +829,7 @@ void Frame::AddImage(std::shared_ptr<QImage> new_image, bool only_odd_lines)
 		if (ret) {
 			return;
 		}
-		
+
 		// Get the frame's image
 		const GenericScopedLock<juce::CriticalSection> lock(addingImageSection);
 		#pragma omp critical (AddImage)
@@ -979,7 +979,8 @@ void Frame::Play()
 		return;
 
 	juce::AudioDeviceManager deviceManager;
-	String error = deviceManager.initialise (0, /* number of input channels */
+	juce::String error = deviceManager.initialise (
+	        0, /* number of input channels */
 	        2, /* number of output channels */
 	        0, /* no XML settings.. */
 	        true  /* select default device on failure */);
@@ -1001,7 +1002,7 @@ void Frame::Play()
 	// Start thread
 	my_thread.startThread();
 
-	AudioTransportSource transport1;
+	juce::AudioTransportSource transport1;
 	transport1.setSource (my_source.get(),
 			5000, // tells it to buffer this many samples ahead
 			&my_thread,