From 377f0a238b12c5c6175a38e07aa145aa156aafdc Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Tue, 26 Nov 2024 14:40:49 +0100
Subject: [PATCH] v0.9.96d - [NEW] Ara mini ja no requereix SDL_mixer, usa
 JailAudio

---
 data/other.lua |  2 +-
 jail_audio.cpp | 12 ++++++++++++
 jail_audio.h   |  2 ++
 mini.cpp       |  5 ++---
 version.h      |  2 +-
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/data/other.lua b/data/other.lua
index 7f14823..8aad69a 100644
--- a/data/other.lua
+++ b/data/other.lua
@@ -1,6 +1,6 @@
 return {
 	peiv = function()
-		setcolor(1, 1, 1, 1)
+		palcolor(1, 1, 1, 1)
 		return "HOLA OTHER UNIT"
 	end
 }
diff --git a/jail_audio.cpp b/jail_audio.cpp
index c6182d1..d561221 100644
--- a/jail_audio.cpp
+++ b/jail_audio.cpp
@@ -192,6 +192,18 @@ int JA_SetMusicVolume(int volume)
     return JA_musicVolume;
 }
 
+void JA_SetMusicPosition(float value)
+{
+    if (!current_music) return;
+    current_music->pos = value * JA_freq;
+}
+
+float JA_GetMusicPosition()
+{
+    if (!current_music) return 0;
+    return float(current_music->pos)/float(JA_freq);
+}
+
 void JA_EnableMusic(const bool value)
 {
     if (!value && current_music != NULL && current_music->state==JA_MUSIC_PLAYING) JA_StopMusic();
diff --git a/jail_audio.h b/jail_audio.h
index eac8a82..c04b6a9 100644
--- a/jail_audio.h
+++ b/jail_audio.h
@@ -19,6 +19,8 @@ void JA_StopMusic();
 JA_Music_state JA_GetMusicState();
 void JA_DeleteMusic(JA_Music_t *music);
 int JA_SetMusicVolume(int volume);
+void JA_SetMusicPosition(float value);
+float JA_GetMusicPosition();
 void JA_EnableMusic(const bool value);
 
 JA_Sound_t *JA_NewSound(Uint8* buffer, Uint32 length);
diff --git a/mini.cpp b/mini.cpp
index 5da15b1..b0738e2 100644
--- a/mini.cpp
+++ b/mini.cpp
@@ -1133,17 +1133,16 @@ void resumemusic() {
 
 void stopmusic(const int t) {
     JA_StopMusic();
-    //Mix_FadeOutMusic(t);
 }
 
 void musicpos(float value)
 {
-    //Mix_SetMusicPosition(value);
+    JA_SetMusicPosition(value);
 }
 
 float musicpos()
 {
-    return 0; //Mix_GetMusicPosition(music);
+    return JA_GetMusicPosition();
 }
 
 int loadsound(const char *filename) {
diff --git a/version.h b/version.h
index ff47d37..f4d99a0 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define MINI_VERSION "0.9.95d"
+#define MINI_VERSION "0.9.96d"