more fs::path port (#8104)

dimitre · web-flow · commit c7879c9e1e1f · 2024-09-10T14:12:43.000-03:00
diff --git a/libs/openFrameworks/app/ofAppGLFWWindow.cpp b/libs/openFrameworks/app/ofAppGLFWWindow.cpp
@@ -409,7 +409,7 @@ void ofAppGLFWWindow::setup(const ofGLESWindowSettings & settings) {
     
 #ifdef TARGET_LINUX
     //------------------------------------------------------------
-    void ofAppGLFWWindow::setWindowIcon(const std::string & path) {
+    void ofAppGLFWWindow::setWindowIcon(const of::filesystem::path & path) {
         ofPixels iconPixels;
         ofLoadImage(iconPixels, path);
         setWindowIcon(iconPixels);
diff --git a/libs/openFrameworks/app/ofAppGLFWWindow.h b/libs/openFrameworks/app/ofAppGLFWWindow.h
@@ -166,7 +166,7 @@ class ofAppGLFWWindow : public ofAppBaseGLWindow {
 	Window getX11Window();
 	XIC getX11XIC();
 
-	void setWindowIcon(const std::string & path);
+	void setWindowIcon(const of::filesystem::path & path);
 	void setWindowIcon(const ofPixels & iconPixels);
 #endif
 
diff --git a/libs/openFrameworks/graphics/ofGraphicsCairo.cpp b/libs/openFrameworks/graphics/ofGraphicsCairo.cpp
@@ -27,7 +27,7 @@ static void ofEndSaveScreen(){
 
 }
 
-static void ofBeginSaveScreen(std::string filename, ofCairoRenderer::Type type, bool bMultipage, bool b3D, ofRectangle outputsize){
+static void ofBeginSaveScreen(const of::filesystem::path & filename, ofCairoRenderer::Type type, bool bMultipage, bool b3D, ofRectangle outputsize){
 	if( bScreenShotStarted ) ofEndSaveScreen();
 	
 	storedRenderer = ofGetCurrentRenderer();
@@ -45,7 +45,7 @@ static void ofBeginSaveScreen(std::string filename, ofCairoRenderer::Type type,
 }
 
 //-----------------------------------------------------------------------------------
-void ofBeginSaveScreenAsPDF(std::string filename, bool bMultipage, bool b3D, ofRectangle outputsize){
+void ofBeginSaveScreenAsPDF(const of::filesystem::path & filename, bool bMultipage, bool b3D, ofRectangle outputsize){
 	ofBeginSaveScreen(filename, ofCairoRenderer::PDF, bMultipage, b3D, outputsize);
 }
 
@@ -55,7 +55,7 @@ void ofEndSaveScreenAsPDF(){
 }
 
 //-----------------------------------------------------------------------------------
-void ofBeginSaveScreenAsSVG(std::string filename, bool bMultipage, bool b3D, ofRectangle outputsize){
+void ofBeginSaveScreenAsSVG(const of::filesystem::path & filename, bool bMultipage, bool b3D, ofRectangle outputsize){
 	ofBeginSaveScreen(filename, ofCairoRenderer::SVG, bMultipage, b3D, outputsize);
 }
 
diff --git a/libs/openFrameworks/graphics/ofGraphicsCairo.h b/libs/openFrameworks/graphics/ofGraphicsCairo.h
@@ -24,15 +24,15 @@
 /// ~~~~
 /// \sa End drawing with ofEndSaveScreenAsPDF()
 ///
-void ofBeginSaveScreenAsPDF(std::string filename, bool bMultipage = false, bool b3D = false, ofRectangle outputsize = ofRectangle(0,0,0,0));
+void ofBeginSaveScreenAsPDF(const of::filesystem::path & filename, bool bMultipage = false, bool b3D = false, ofRectangle outputsize = ofRectangle(0,0,0,0));
 
 /// \brief Terminates draw to PDF through ofCairoRenderer and outputs the file.
 /// \sa ofBeginSaveScreenAsPDF()
 void ofEndSaveScreenAsPDF();
 
 /// \brief Begin rendering to a SVG file.
 /// \sa ofEndSaveScreenAsSVG(), ofBeginSaveScreenAsPDF()
-void ofBeginSaveScreenAsSVG(std::string filename, bool bMultipage = false, bool b3D = false, ofRectangle outputsize = ofRectangle(0,0,0,0));
+void ofBeginSaveScreenAsSVG(const of::filesystem::path & filename, bool bMultipage = false, bool b3D = false, ofRectangle outputsize = ofRectangle(0,0,0,0));
 
 /// \brief Terminates draw to SVG and outputs the file.
 /// \sa ofBeginSaveScreenAsSVG()
diff --git a/libs/openFrameworks/graphics/ofImage.cpp b/libs/openFrameworks/graphics/ofImage.cpp
@@ -410,7 +410,7 @@ bool ofLoadImage(ofTexture & tex, const ofBuffer & buffer, const ofImageLoadSett
 
 //----------------------------------------------------------------
 template<typename PixelType>
-static bool saveImage(const ofPixels_<PixelType> & _pix, const of::filesystem::path& _fileName, ofImageQualityType qualityLevel) {
+static bool saveImage(const ofPixels_<PixelType> & _pix, const of::filesystem::path & _fileName, ofImageQualityType qualityLevel) {
 	ofInitFreeImage();
 	if (_pix.isAllocated() == false){
 		ofLogError("ofImage") << "saveImage(): couldn't save " << _fileName << ", pixels are not allocated";
@@ -797,7 +797,7 @@ bool ofImage_<PixelType>::load(const of::filesystem::path & fileName, const ofIm
 
 //----------------------------------------------------------
 template<typename PixelType>
-bool ofImage_<PixelType>::loadImage(const std::string& fileName){
+bool ofImage_<PixelType>::loadImage(const of::filesystem::path & fileName){
 	return load(fileName);
 }
 
@@ -838,7 +838,7 @@ bool ofImage_<PixelType>::save(ofBuffer & buffer, ofImageFormat imageFormat, ofI
 
 //----------------------------------------------------------
 template<typename PixelType>
-void ofImage_<PixelType>::saveImage(const std::string& fileName, ofImageQualityType qualityLevel) const {
+void ofImage_<PixelType>::saveImage(const of::filesystem::path & fileName, ofImageQualityType qualityLevel) const {
 	save(fileName, qualityLevel);
 }
 
diff --git a/libs/openFrameworks/graphics/ofImage.h b/libs/openFrameworks/graphics/ofImage.h
@@ -227,7 +227,7 @@ class ofImage_ : public ofBaseImage_<PixelType>{
 	bool load(const ofBuffer & buffer, const ofImageLoadSettings &settings = ofImageLoadSettings());
 
     [[deprecated("Use load")]]
-	bool loadImage(const std::string& fileName);
+	bool loadImage(const of::filesystem::path  & fileName);
     [[deprecated("Use load")]]
 	bool loadImage(const ofBuffer & buffer);
     [[deprecated("Use load")]]
@@ -616,7 +616,7 @@ class ofImage_ : public ofBaseImage_<PixelType>{
 	bool save(ofBuffer & buffer, ofImageFormat imageFormat = OF_IMAGE_FORMAT_PNG, ofImageQualityType compressionLevel = OF_IMAGE_QUALITY_BEST) const;
 
     [[deprecated("Use save")]]
-	void saveImage(const std::string& fileName, ofImageQualityType compressionLevel = OF_IMAGE_QUALITY_BEST) const;
+	void saveImage(const of::filesystem::path & fileName, ofImageQualityType compressionLevel = OF_IMAGE_QUALITY_BEST) const;
     [[deprecated("Use save")]]
 	void saveImage(ofBuffer & buffer, ofImageQualityType compressionLevel = OF_IMAGE_QUALITY_BEST) const;
     [[deprecated("Use save")]]
diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.cpp b/libs/openFrameworks/graphics/ofTrueTypeFont.cpp
@@ -613,7 +613,7 @@ void ofTrueTypeFont::reloadTextures(){
 }
 
 //-----------------------------------------------------------
-bool ofTrueTypeFont::loadFont(string filename, int fontSize, bool bAntiAliased, bool bFullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {
+bool ofTrueTypeFont::loadFont(const of::filesystem::path & filename, int fontSize, bool bAntiAliased, bool bFullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {
 	return load(filename, fontSize, bAntiAliased, bFullCharacterSet, makeContours, simplifyAmt, dpi);
 }
 
@@ -689,7 +689,7 @@ ofTrueTypeFont::glyph ofTrueTypeFont::loadGlyph(uint32_t utf8) const{
 }
 
 //-----------------------------------------------------------
-bool ofTrueTypeFont::load(const of::filesystem::path& filename, int fontSize, bool antialiased, bool fullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {
+bool ofTrueTypeFont::load(const of::filesystem::path & filename, int fontSize, bool antialiased, bool fullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {
 	
 	ofTrueTypeFontSettings settings(filename,fontSize);
 	settings.antialiased = antialiased;
diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.h b/libs/openFrameworks/graphics/ofTrueTypeFont.h
@@ -204,7 +204,7 @@ class ofTrueTypeFont {
 		int dpi = 0);
 
 	[[deprecated("Use load")]]
-	bool loadFont(std::string filename, int fontsize, bool _bAntiAliased = true, bool _bFullCharacterSet = false, bool makeContours = false, float simplifyAmt = 0.0f, int dpi = 0);
+	bool loadFont(const of::filesystem::path & filename, int fontsize, bool _bAntiAliased = true, bool _bFullCharacterSet = false, bool makeContours = false, float simplifyAmt = 0.0f, int dpi = 0);
 
 	bool load(const ofTrueTypeFontSettings & settings);
 
diff --git a/libs/openFrameworks/sound/ofAVEngineSoundPlayer.mm b/libs/openFrameworks/sound/ofAVEngineSoundPlayer.mm
@@ -1018,7 +1018,7 @@ - (float)soundDurationSeconds{
         unload();
     }
 
-    string filePath = ofToDataPath(fileName);
+    auto filePath = ofToDataPath(fileName);
     @autoreleasepool {
         soundPlayer = [[AVEnginePlayer alloc] init];
     }
diff --git a/libs/openFrameworks/sound/ofMediaFoundationSoundPlayer.cpp b/libs/openFrameworks/sound/ofMediaFoundationSoundPlayer.cpp
@@ -190,6 +190,7 @@ ofMediaFoundationSoundPlayer::~ofMediaFoundationSoundPlayer() {
 bool ofMediaFoundationSoundPlayer::load(const of::filesystem::path& fileName, bool stream) {
     unload();
     
+	// FIXME: wstring?
     std::string fileStr = ofPathToString(fileName);
     bool bStream = false;
     bStream = bStream || ofIsStringInString(fileStr, "http://");
diff --git a/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp b/libs/openFrameworks/sound/ofOpenALSoundPlayer.cpp
@@ -480,7 +480,7 @@ bool ofOpenALSoundPlayer::readFile(const of::filesystem::path& fileName, std::ve
 }
 
 //------------------------------------------------------------
-bool ofOpenALSoundPlayer::load(const of::filesystem::path& _fileName, bool is_stream){
+bool ofOpenALSoundPlayer::load(const of::filesystem::path & _fileName, bool is_stream){
 
 	auto fileName = ofToDataPath(_fileName);
 
diff --git a/libs/openFrameworks/sound/ofSoundPlayer.cpp b/libs/openFrameworks/sound/ofSoundPlayer.cpp
@@ -121,7 +121,7 @@ bool ofSoundPlayer::load(const of::filesystem::path& fileName, bool stream){
 }
 
 //--------------------------------------------------------------------
-bool ofSoundPlayer::loadSound(std::string fileName, bool stream){
+bool ofSoundPlayer::loadSound(const of::filesystem::path & fileName, bool stream){
 	return load(fileName,stream);
 }
 
diff --git a/libs/openFrameworks/sound/ofSoundPlayer.h b/libs/openFrameworks/sound/ofSoundPlayer.h
@@ -47,9 +47,9 @@ 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();
diff --git a/libs/openFrameworks/utils/ofUtils.cpp b/libs/openFrameworks/utils/ofUtils.cpp
@@ -1023,7 +1023,7 @@ std::string ofGetVersionPreRelease() {
 //from the forums http://www.openframeworks.cc/forum/viewtopic.php?t=1413
 
 //--------------------------------------------------
-void ofSaveScreen(const string & filename) {
+void ofSaveScreen(const of::filesystem::path & filename) {
 	/*ofImage screen;
    screen.allocate(ofGetWidth(), ofGetHeight(), OF_IMAGE_COLOR);
    screen.grabScreen(0, 0, ofGetWidth(), ofGetHeight());
@@ -1034,7 +1034,7 @@ void ofSaveScreen(const string & filename) {
 }
 
 //--------------------------------------------------
-void ofSaveViewport(const string & filename) {
+void ofSaveViewport(const of::filesystem::path & filename) {
 	// because ofSaveScreen doesn't related to viewports
 	/*ofImage screen;
 	ofRectangle view = ofGetCurrentViewport();
diff --git a/libs/openFrameworks/utils/ofUtils.h b/libs/openFrameworks/utils/ofUtils.h
@@ -1235,7 +1235,7 @@ std::string ofGetVersionPreRelease();
 /// The output file type will be deduced from the given file name.
 ///
 /// \param filename The image output file.
-void ofSaveScreen(const std::string & filename);
+void ofSaveScreen(const of::filesystem::path & filename);
 
 /// \brief Saves the current frame as a PNG image.
 ///
@@ -1250,7 +1250,7 @@ void ofSaveFrame(bool bUseViewport = false);
 /// The output file type will be deduced from the given file name.
 ///
 /// \param filename The image output file.
-void ofSaveViewport(const std::string & filename);
+void ofSaveViewport(const of::filesystem::path & filename);
 
 /// \section System
 
diff --git a/libs/openFrameworks/video/ofAVFoundationPlayer.h b/libs/openFrameworks/video/ofAVFoundationPlayer.h
@@ -26,7 +26,8 @@ class ofAVFoundationPlayer : public ofBaseVideoPlayer {
 	
 	ofAVFoundationPlayer();
 	~ofAVFoundationPlayer();
-	   
+	
+	//FIXME: FS
 	bool load(std::string name);
 	void loadAsync(std::string name);
 	void close();
diff --git a/libs/openFrameworks/video/ofDirectShowPlayer.cpp b/libs/openFrameworks/video/ofDirectShowPlayer.cpp
@@ -534,11 +534,9 @@ class DirectShowVideo : public ISampleGrabberCB{
         }
 
         //printf("step 6\n"); 
-        std::string pathString = path.string();
-        std::wstring filePathW = std::wstring(pathString.begin(), pathString.end());
 
         //this is the easier way to connect the graph, but we have to remove the video window manually
-        hr = m_pGraph->RenderFile(filePathW.c_str(), NULL);
+        hr = m_pGraph->RenderFile(path.c_str(), NULL);
 
         //this is the more manual way to do it - its a pain though because the audio won't be connected by default
         /*hr = m_pGraph->AddSourceFilter(filePathW.c_str(), L"Source", &m_pSourceFile); 
diff --git a/libs/openFrameworks/video/ofVideoBaseTypes.h b/libs/openFrameworks/video/ofVideoBaseTypes.h
@@ -207,6 +207,7 @@ class ofBaseVideoPlayer: virtual public ofBaseVideo{
 	/// \param name The name of the video resource to load.
 	/// \return True if the video was loaded successfully.
 	/// \sa loadAsync()
+	// FIXME: FS
 	virtual bool load(std::string name) = 0;
 	/// \brief Asynchronously load a video resource by name.
 	///

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ static void ofEndSaveScreen(){`
`27`	`27`
`28`	`28`	`}`
`29`	`29`
`30`		`-static void ofBeginSaveScreen(std::string filename, ofCairoRenderer::Type type, bool bMultipage, bool b3D, ofRectangle outputsize){`
	`30`	`+static void ofBeginSaveScreen(const of::filesystem::path & filename, ofCairoRenderer::Type type, bool bMultipage, bool b3D, ofRectangle outputsize){`
`31`	`31`	`if( bScreenShotStarted ) ofEndSaveScreen();`
`32`	`32`
`33`	`33`	`storedRenderer = ofGetCurrentRenderer();`
`@@ -45,7 +45,7 @@ static void ofBeginSaveScreen(std::string filename, ofCairoRenderer::Type type,`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`//-----------------------------------------------------------------------------------`
`48`		`-void ofBeginSaveScreenAsPDF(std::string filename, bool bMultipage, bool b3D, ofRectangle outputsize){`
	`48`	`+void ofBeginSaveScreenAsPDF(const of::filesystem::path & filename, bool bMultipage, bool b3D, ofRectangle outputsize){`
`49`	`49`	`ofBeginSaveScreen(filename, ofCairoRenderer::PDF, bMultipage, b3D, outputsize);`
`50`	`50`	`}`
`51`	`51`
`@@ -55,7 +55,7 @@ void ofEndSaveScreenAsPDF(){`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`//-----------------------------------------------------------------------------------`
`58`		`-void ofBeginSaveScreenAsSVG(std::string filename, bool bMultipage, bool b3D, ofRectangle outputsize){`
	`58`	`+void ofBeginSaveScreenAsSVG(const of::filesystem::path & filename, bool bMultipage, bool b3D, ofRectangle outputsize){`
`59`	`59`	`ofBeginSaveScreen(filename, ofCairoRenderer::SVG, bMultipage, b3D, outputsize);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ void ofTrueTypeFont::reloadTextures(){`
`613`	`613`	`}`
`614`	`614`
`615`	`615`	`//-----------------------------------------------------------`
`616`		`-bool ofTrueTypeFont::loadFont(string filename, int fontSize, bool bAntiAliased, bool bFullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {`
	`616`	`+bool ofTrueTypeFont::loadFont(const of::filesystem::path & filename, int fontSize, bool bAntiAliased, bool bFullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {`
`617`	`617`	`return load(filename, fontSize, bAntiAliased, bFullCharacterSet, makeContours, simplifyAmt, dpi);`
`618`	`618`	`}`
`619`	`619`
`@@ -689,7 +689,7 @@ ofTrueTypeFont::glyph ofTrueTypeFont::loadGlyph(uint32_t utf8) const{`
`689`	`689`	`}`
`690`	`690`
`691`	`691`	`//-----------------------------------------------------------`
`692`		`-bool ofTrueTypeFont::load(const of::filesystem::path& filename, int fontSize, bool antialiased, bool fullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {`
	`692`	`+bool ofTrueTypeFont::load(const of::filesystem::path & filename, int fontSize, bool antialiased, bool fullCharacterSet, bool makeContours, float simplifyAmt, int dpi) {`
`693`	`693`
`694`	`694`	`ofTrueTypeFontSettings settings(filename,fontSize);`
`695`	`695`	`settings.antialiased = antialiased;`
Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ - (float)soundDurationSeconds{`
`1018`	`1018`	`unload();`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`		`- string filePath = ofToDataPath(fileName);`
	`1021`	`+ auto filePath = ofToDataPath(fileName);`
`1022`	`1022`	`@autoreleasepool {`
`1023`	`1023`	`soundPlayer = [[AVEnginePlayer alloc] init];`
`1024`	`1024`	`}`