Use std::filesystem for paths

Signed-off-by: Artem Senichev <artemsen@gmail.com>

Author: artemsen

README.md

@@ -15,7 +15,7 @@ List of supported distributives can be found on the [Repology page](https://repo
 ## Build
 
 To build the project you will need:
-- C++ compiler with support for the C++11 standard;
+- C++ compiler with support for the C++20 standard;
 - Meson build system;
 - SDL3 library.
 

meson.build

@@ -5,7 +5,7 @@ project(
     'cpp',
     default_options: [
         'warning_level=3',
-        'cpp_std=c++11',
+        'cpp_std=c++20',
         'buildtype=release',
     ],
     license: 'MIT',

src/sound.cpp

@@ -8,7 +8,7 @@
 
 #include <SDL3/SDL.h>
 
-#include <string>
+#include <cstring>
 
 // The only supported audio format
 constexpr const SDL_AudioSpec sound_spec = { SDL_AUDIO_S16, 2, 44100 };
@@ -41,8 +41,8 @@ bool Sound::initialize()
     // load wave files
     if (!load(APP_DATADIR)) {
         // try portable variant
-        std::string path(SDL_GetBasePath());
-        path += "data";
+        std::filesystem::path path(SDL_GetBasePath());
+        path /= "data";
         if (!load(path.c_str())) {
             return false;
         }
@@ -59,32 +59,32 @@ void Sound::play(Sound::Type type)
     }
 }
 
-bool Sound::load(const char* dir)
+bool Sound::load(const std::filesystem::path& dir)
 {
-    memset(waves, 0, sizeof(waves));
-
     for (size_t i = 0; i < sizeof(waves) / sizeof(waves[0]); ++i) {
         SDL_AudioSpec spec;
-        std::string file = dir;
+        std::filesystem::path file = dir;
         switch (i) {
             case Clatz:
-                file += "clatz.wav";
+                file /= "clatz.wav";
                 break;
             case Complete:
-                file += "complete.wav";
+                file /= "complete.wav";
                 break;
         }
-        if (!SDL_LoadWAV(file.c_str(), &spec, &waves[i].data, &waves[i].size)) {
+        const std::string wav_path = file.string();
+        if (!SDL_LoadWAV(wav_path.c_str(), &spec, &waves[i].data,
+                         &waves[i].size)) {
             SDL_LogError(SDL_LOG_CATEGORY_AUDIO, "Error loading wav %s: %s",
-                         file.c_str(), SDL_GetError());
+                         wav_path.c_str(), SDL_GetError());
             break;
         }
         if (spec.format != sound_spec.format ||
             spec.channels != sound_spec.channels ||
             spec.freq != sound_spec.freq) {
             SDL_LogError(SDL_LOG_CATEGORY_AUDIO,
                          "Error loading wav %s: unsupported format",
-                         file.c_str());
+                         wav_path.c_str());
             break;
         }
     }
@@ -93,7 +93,8 @@ bool Sound::load(const char* dir)
         SDL_free(waves[Clatz].data);
         SDL_free(waves[Complete].data);
         memset(waves, 0, sizeof(waves));
+        return false;
     }
 
-    return waves[Clatz].data && waves[Complete].data;
+    return true;
 }

src/sound.hpp

@@ -6,6 +6,8 @@
 
 #include <SDL3/SDL.h>
 
+#include <filesystem>
+
 /** Sound subsystem. */
 class Sound {
 public:
@@ -37,13 +39,13 @@ class Sound {
      * @param dir path to directory with sound files (wav)
      * @return false if load failed
      */
-    bool load(const char* dir);
+    bool load(const std::filesystem::path& dir);
 
     struct Wave {
         Uint8* data; ///< Plain wave data
         Uint32 size; ///< Size of wave data
     };
-    Wave waves[2]; ///< Wav data instances
+    Wave waves[2] = {}; ///< Wav data instances
 
     SDL_AudioStream* stream; ///< Output audio stream
 };

src/state.cpp

@@ -7,6 +7,7 @@
 #include <SDL3/SDL.h>
 
 #include <cstring>
+#include <filesystem>
 #include <vector>
 
 #include "level.hpp"
@@ -35,10 +36,10 @@ class IniFile {
     {
         char* dir = SDL_GetPrefPath(nullptr, app_name);
         if (dir) {
-            std::string path = dir;
-            path += state_file;
+            std::filesystem::path path(dir);
+            path /= state_file;
             SDL_free(dir);
-            io = SDL_IOFromFile(path.c_str(), readonly ? "rb" : "wb");
+            io = SDL_IOFromFile(path.string().c_str(), readonly ? "rb" : "wb");
         }
     }