Use mp3 with PSP version

sharkwouter · Jul 10, 2023 · 8d40e34 · 8d40e34
1 parent 076ec5d
commit 8d40e34
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,7 +72,6 @@ set(ASSETS_BACKGROUNDS "${CMAKE_SOURCE_DIR}/assets/backgrounds")
 
 if(PSP)
     set(ASSETS_BACKGROUNDS "${CMAKE_CURRENT_SOURCE_DIR}/platform/psp/assets/backgrounds")
-    set(ASSETS_MUSIC "${CMAKE_CURRENT_SOURCE_DIR}/platform/psp/assets/music")
 elseif(VITA)
     set(ASSETS_BACKGROUNDS "${CMAKE_SOURCE_DIR}/platform/vita/assets/backgrounds")
 endif()

diff --git a/platform/psp/assets/music/song1.ogg b/platform/psp/assets/music/song1.ogg
diff --git a/platform/psp/assets/music/song2.ogg b/platform/psp/assets/music/song2.ogg
diff --git a/platform/psp/assets/music/song3.ogg b/platform/psp/assets/music/song3.ogg
diff --git a/platform/psp/assets/music/song4.ogg b/platform/psp/assets/music/song4.ogg
diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp
@@ -63,11 +63,7 @@ void ThemeManager::loadMusic(Theme theme) {
 
     this->music_theme = theme;
 
-    #ifdef __PSP__
-        std::string music_file_type = "ogg";
-    #else
-        std::string music_file_type = "mp3";
-    #endif
+    std::string music_file_type = "mp3";
 
     switch (this->music_theme) {
         case Theme::THEME1:
@@ -193,4 +189,4 @@ SDL_Texture * ThemeManager::createBackgroundTexture(std::string filename) {
     }
 
     return texture;
-}
+}