File 0005-Fixed-music-not-playing-on-Linux.patch of Package jazz2

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Fixed-music-not-playing-on-Linux.patch of Package jazz2 (Revision 203e0f3d6dc98f182960d4cd108a6225)

Currently displaying revision 203e0f3d6dc98f182960d4cd108a6225 , Show latest

From cc8bee3dd2c5e8965a0dc56f6d4705ef925512f3 Mon Sep 17 00:00:00 2001
From: Death Killer <danielrajf@gmail.com>
Date: Mon, 10 Oct 2022 01:05:51 +0200
Subject: [PATCH 5/5] Fixed music not playing on Linux

---
 Jazz2/nCine/Audio/IAudioLoader.cpp      | 14 +++++--------
 Jazz2/nCine/Graphics/ITextureLoader.cpp | 28 +++++++++++++++----------
 Jazz2/nCine/IO/FileSystem.cpp           |  7 ++++---
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Jazz2/nCine/Audio/IAudioLoader.cpp b/Jazz2/nCine/Audio/IAudioLoader.cpp
index 05d4224..940e3e3 100644
--- a/Jazz2/nCine/Audio/IAudioLoader.cpp
+++ b/Jazz2/nCine/Audio/IAudioLoader.cpp
@@ -47,23 +47,19 @@ namespace nCine
 			return std::make_unique<AudioLoaderWav>(std::move(fileHandle));
 		}
 #ifdef WITH_VORBIS
-		else if (fs::HasExtension(filename, "ogg"_s)) {
+		if (fs::HasExtension(filename, "ogg"_s)) {
 			return std::make_unique<AudioLoaderOgg>(std::move(fileHandle));
 		}
 #endif
 #ifdef WITH_OPENMPT
-		else if (extension == "j2b"_s || extension == "it"_s || extension == "s3m"_s ||
-				 extension == "xm"_s || extension == "mo3"_s) {
+		if (extension == "j2b"_s || extension == "it"_s || extension == "s3m"_s || extension == "xm"_s || extension == "mo3"_s) {
 			return std::make_unique<AudioLoaderMpt>(std::move(fileHandle));
 		}
 #endif
-		else {
-			LOGF_X("Extension unknown: \"%s\"", extension.data());
-			fileHandle.reset(nullptr);
-			return std::make_unique<InvalidAudioLoader>(std::move(fileHandle));
-		}
 
-		return nullptr;
+		LOGF_X("Extension unknown: \"%s\"", extension.data());
+		fileHandle.reset(nullptr);
+		return std::make_unique<InvalidAudioLoader>(std::move(fileHandle));
 	}
 
 }
diff --git a/Jazz2/nCine/Graphics/ITextureLoader.cpp b/Jazz2/nCine/Graphics/ITextureLoader.cpp
index 2498f19..bc8f45f 100644
--- a/Jazz2/nCine/Graphics/ITextureLoader.cpp
+++ b/Jazz2/nCine/Graphics/ITextureLoader.cpp
@@ -85,31 +85,37 @@ namespace nCine
 	std::unique_ptr<ITextureLoader> ITextureLoader::createLoader(std::unique_ptr<IFileStream> fileHandle, const StringView& filename)
 	{
 		auto extension = fs::GetExtension(filename);
-		if (extension == "dds"_s)
+		if (extension == "dds"_s) {
 			return std::make_unique<TextureLoaderDds>(std::move(fileHandle));
-		else if (extension == "pvr"_s)
+		}
+		if (extension == "pvr"_s) {
 			return std::make_unique<TextureLoaderPvr>(std::move(fileHandle));
-		else if (extension == "ktx"_s)
+		}
+		if (extension == "ktx"_s) {
 			return std::make_unique<TextureLoaderKtx>(std::move(fileHandle));
+		}
 	//#ifdef WITH_PNG
-		else if (extension == "png"_s)
+		if (extension == "png"_s) {
 			return std::make_unique<TextureLoaderPng>(std::move(fileHandle));
+		}
 	//#endif
 	/*#ifdef WITH_WEBP
-		else if (extension == "webp"_s)
+		if (extension == "webp"_s) {
 			return std::make_unique<TextureLoaderWebP>(std::move(fileHandle));
+		}
 	#endif*/
 	#ifdef DEATH_TARGET_ANDROID
-		else if (extension == "pkm"_s)
+		if (extension == "pkm"_s) {
 			return std::make_unique<TextureLoaderPkm>(std::move(fileHandle));
+		}
 	#endif
-		else if (extension == "qoi"_s) {
+		if (extension == "qoi"_s) {
 			return std::make_unique<TextureLoaderQoi>(std::move(fileHandle));
-		} else {
-			LOGF_X("Extension unknown: \"%s\"", extension.data());
-			fileHandle.reset(nullptr);
-			return std::make_unique<InvalidTextureLoader>(std::move(fileHandle));
 		}
+
+		LOGF_X("Extension unknown: \"%s\"", extension.data());
+		fileHandle.reset(nullptr);
+		return std::make_unique<InvalidTextureLoader>(std::move(fileHandle));
 	}
 
 	void ITextureLoader::loadPixels(GLenum internalFormat)
diff --git a/Jazz2/nCine/IO/FileSystem.cpp b/Jazz2/nCine/IO/FileSystem.cpp
index c27cd70..ab831fc 100644
--- a/Jazz2/nCine/IO/FileSystem.cpp
+++ b/Jazz2/nCine/IO/FileSystem.cpp
@@ -433,15 +433,16 @@ namespace nCine
 		}
 
 		size_t l = path.size();
-		String result(NoInit, path.size() + 2);
-
 		char* p = (char*)alloca(l + 1);
 		strncpy(p, path.data(), l);
 		p[l] = '\0';
 		size_t rl = 0;
+		bool isAbsolute = (p[0] == '/' || p[0] == '\\');
+
+		String result(NoInit, path.size() + (isAbsolute ? 0 : 2));
 
 		DIR* d;
-		if (p[0] == '/' || p[0] == '\\') {
+		if (isAbsolute) {
 			d = ::opendir("/");
 			p = p + 1;
 		} else {
-- 
2.37.3

Places

File 0005-Fixed-music-not-playing-on-Linux.patch of Package jazz2 (Revision 203e0f3d6dc98f182960d4cd108a6225)

Places