fixes

Author: dimitre

libs/openFrameworks/app/ofAppEGLWindow.cpp

@@ -1,9 +1,9 @@
 #include "ofAppEGLWindow.h"
 
+#include "ofFileUtils.h"
 #include "ofGraphics.h" // used in runAppViaInfiniteLoop()
 #include "ofAppRunner.h"
 #include "ofUtils.h"
-#include "ofFileUtils.h"
 #include "ofGLProgrammableRenderer.h"
 #include "ofGLRenderer.h"
 #include "ofVectorMath.h"

libs/openFrameworks/gl/ofShader.cpp

@@ -1,3 +1,4 @@
+#include "ofFileUtils.h"
 #include "ofBufferObject.h"
 #include "ofCubeMap.h"
 // #include "ofFileUtils.h"

libs/openFrameworks/sound/ofAVEngineSoundPlayer.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-namespace of { namespace filesystem { class path; } }
+//namespace of { namespace filesystem { class path; } }
 
 #ifdef OF_SOUND_PLAYER_AV_ENGINE
 

libs/openFrameworks/sound/ofFmodSoundPlayer.cpp

@@ -177,7 +177,7 @@ void ofFmodSoundPlayer::closeFmod(){
 }
 
 //------------------------------------------------------------
-bool ofFmodSoundPlayer::load(const of::filesystem::path& _fileName, bool stream){
+bool ofFmodSoundPlayer::load(const of::filesystem::path & _fileName, bool stream){
 
 	auto fileName = ofToDataPath(_fileName);
 

libs/openFrameworks/sound/ofFmodSoundPlayer.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include "ofSoundBaseTypes.h"
 // MARK: this is to define the constant OF_SOUND_PLAYER_FMOD
 #include "ofConstants.h"
 
 #ifdef OF_SOUND_PLAYER_FMOD
 
-#include "ofSoundBaseTypes.h"
 
 
 extern "C" {
@@ -42,7 +42,7 @@ class ofFmodSoundPlayer : public ofBaseSoundPlayer {
 		ofFmodSoundPlayer();
 		virtual ~ofFmodSoundPlayer();
 
-        bool load(const of::filesystem::path& fileName, bool stream = false);
+        bool load(const of::filesystem::path & fileName, bool stream = false);
 		void unload();
 		void play();
 		void stop();

libs/openFrameworks/sound/ofMediaFoundationSoundPlayer.h

@@ -116,7 +116,7 @@ class ofMediaFoundationSoundPlayer : public ofBaseSoundPlayer, public of::MFSour
 	ofMediaFoundationSoundPlayer();
 	~ofMediaFoundationSoundPlayer();
 
-	bool load(const of::filesystem::path& fileName, bool stream = false) override;
+	bool load(const of::filesystem::path & fileName, bool stream = false) override;
 	void unload() override;
 
 	void play() override;

libs/openFrameworks/sound/ofOpenALSoundPlayer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 // MARK: Review later
-#include "ofConstants.h"
+//#include "ofConstants.h"
 
 #ifdef OF_SOUND_PLAYER_OPENAL
 #include "ofSoundBaseTypes.h"
@@ -47,7 +47,7 @@ class ofOpenALSoundPlayer : public ofBaseSoundPlayer, public ofThread {
 		ofOpenALSoundPlayer();
 		virtual ~ofOpenALSoundPlayer();
 
-        bool load(const of::filesystem::path& fileName, bool stream = false);
+        bool load(const of::filesystem::path & fileName, bool stream = false);
 		void unload();
 		void play();
 		void stop();

libs/openFrameworks/sound/ofSoundBaseTypes.h

@@ -5,6 +5,7 @@
 //namespace of { namespace filesystem { class path; } }
 
 #include <functional>
+#include <string>
 
 class ofSoundBuffer;
 
@@ -88,7 +89,7 @@ class ofSoundDevice {
 
 	/// \brief Descriptive name for the device
 	/// This is the same string that ofSoundStream::getMatchingDevices() will be looking for
-	std::string name{"Unknown"};
+	std::string name { "Unknown" };
 
 	/// \brief The device's unique ID (to be used in ofSoundStream::setDeviceID() )
 	int deviceID = -1;
@@ -178,8 +179,8 @@ class ofBaseSoundPlayer {
 	ofBaseSoundPlayer(){};
 	virtual ~ofBaseSoundPlayer(){};
 
-	virtual bool load(const of::filesystem::path & fileName, bool stream = false)=0;
-	virtual void unload()=0;
+	virtual bool load(const of::filesystem::path & fileName, bool stream = false) = 0;
+	virtual void unload() = 0;
 	virtual void play() = 0;
 	virtual void stop() = 0;
 

libs/openFrameworks/sound/ofSoundPlayer.cpp

@@ -121,15 +121,15 @@ std::shared_ptr<ofBaseSoundPlayer> ofSoundPlayer::getPlayer(){
 }
 
 //--------------------------------------------------------------------
-bool ofSoundPlayer::load(const of::filesystem::path& fileName, bool stream){
+bool ofSoundPlayer::load(const of::filesystem::path & fileName, bool stream){
 	if( player ){
 		return player->load(fileName, stream);
 	}
 	return false;
 }
 
 //--------------------------------------------------------------------
-bool ofSoundPlayer::loadSound(std::string fileName, bool stream){
+bool ofSoundPlayer::loadSound(const of::filesystem::path & fileName, bool stream){
 	return load(fileName,stream);
 }
 

libs/openFrameworks/sound/ofSoundPlayer.h

@@ -3,7 +3,7 @@
 #include "ofSoundBaseTypes.h"
 // MARK: ofConstants FS
 //#include "ofConstants.h"
-namespace of { namespace filesystem { class path; } }
+//namespace of { namespace filesystem { class path; } }
 
 
 /// \brief Stops all active sound players on FMOD-based systems (windows, osx).
@@ -49,12 +49,14 @@ class ofSoundPlayer : public ofBaseSoundPlayer {
     ///
     /// \param fileName Path to the sound file, relative to your app's data folder.
     /// \param stream set "true" to enable streaming from disk (for large files).
-    bool load(const of::filesystem::path& fileName, bool stream = false);
+    bool load(const of::filesystem::path & fileName, bool stream = false);
+
     [[deprecated("Use load")]]
-	bool loadSound(std::string fileName, bool stream = false);
+	bool loadSound(const of::filesystem::path & fileName, bool stream = false);
 
     /// \brief Stops and unloads the current sound.
     void unload();
+	
 	[[deprecated("Use unload")]]
 	void unloadSound();
 
@@ -107,6 +109,7 @@ class ofSoundPlayer : public ofBaseSoundPlayer {
     /// \brief Gets current playback state.
     /// \return true if the player is currently playing a file.
     bool isPlaying() const;
+	
     [[deprecated("Use isPlaying")]]
 	bool getIsPlaying() const;