ruby2d 0.9.4 → 0.11.1

data/{assets/linux/simple2d/src → ext/ruby2d}/music.c

@@ -1,31 +1,31 @@
 // music.c
 
-#include "../include/simple2d.h"
+#include "ruby2d.h"
 
 
 /*
  * Create the music
  */
-S2D_Music *S2D_CreateMusic(const char *path) {
-  S2D_Init();
+R2D_Music *R2D_CreateMusic(const char *path) {
+  R2D_Init();
 
   // Check if music file exists
-  if (!S2D_FileExists(path)) {
-    S2D_Error("S2D_CreateMusic", "Music file `%s` not found", path);
+  if (!R2D_FileExists(path)) {
+    R2D_Error("R2D_CreateMusic", "Music file `%s` not found", path);
     return NULL;
   }
 
   // Allocate the music structure
-  S2D_Music *mus = (S2D_Music *) malloc(sizeof(S2D_Music));
+  R2D_Music *mus = (R2D_Music *) malloc(sizeof(R2D_Music));
   if (!mus) {
-    S2D_Error("S2D_CreateMusic", "Out of memory!");
+    R2D_Error("R2D_CreateMusic", "Out of memory!");
     return NULL;
   }
 
   // Load the music data from file
   mus->data = Mix_LoadMUS(path);
   if (!mus->data) {
-    S2D_Error("Mix_LoadMUS", Mix_GetError());
+    R2D_Error("Mix_LoadMUS", Mix_GetError());
     free(mus);
     return NULL;
   }
@@ -33,6 +33,11 @@ S2D_Music *S2D_CreateMusic(const char *path) {
   // Initialize values
   mus->path = path;
 
+  // Calculate the length of music by creating a temporary R2D_Sound object
+  R2D_Sound *snd = R2D_CreateSound(path);
+  mus->length = R2D_GetSoundLength(snd);
+  R2D_FreeSound(snd);
+
   return mus;
 }
 
@@ -40,7 +45,7 @@ S2D_Music *S2D_CreateMusic(const char *path) {
 /*
  * Play the music
  */
-void S2D_PlayMusic(S2D_Music *mus, bool loop) {
+void R2D_PlayMusic(R2D_Music *mus, bool loop) {
   if (!mus) return;
 
   // If looping, set to -1 times; else 0
@@ -49,7 +54,7 @@ void S2D_PlayMusic(S2D_Music *mus, bool loop) {
   // times: 0 == once, -1 == forever
   if (Mix_PlayMusic(mus->data, times) == -1) {
     // No music for you
-    S2D_Error("S2D_PlayMusic", Mix_GetError());
+    R2D_Error("R2D_PlayMusic", Mix_GetError());
   }
 }
 
@@ -57,7 +62,7 @@ void S2D_PlayMusic(S2D_Music *mus, bool loop) {
 /*
  * Pause the playing music
  */
-void S2D_PauseMusic() {
+void R2D_PauseMusic() {
   Mix_PauseMusic();
 }
 
@@ -65,7 +70,7 @@ void S2D_PauseMusic() {
 /*
  * Resume the current music
  */
-void S2D_ResumeMusic() {
+void R2D_ResumeMusic() {
   Mix_ResumeMusic();
 }
 
@@ -73,7 +78,7 @@ void S2D_ResumeMusic() {
 /*
  * Stop the playing music; interrupts fader effects
  */
-void S2D_StopMusic() {
+void R2D_StopMusic() {
   Mix_HaltMusic();
 }
 
@@ -81,7 +86,7 @@ void S2D_StopMusic() {
 /*
  * Get the music volume
  */
-int S2D_GetMusicVolume() {
+int R2D_GetMusicVolume() {
   // Get music volume as percentage of maximum mix volume
   return ceil(Mix_VolumeMusic(-1) * (100.0 / MIX_MAX_VOLUME));
 }
@@ -90,7 +95,7 @@ int S2D_GetMusicVolume() {
 /*
  * Set the music volume a given percentage
  */
-void S2D_SetMusicVolume(int volume) {
+void R2D_SetMusicVolume(int volume) {
   // Set volume to be a percentage of the maximum mix volume
   Mix_VolumeMusic((volume / 100.0) * MIX_MAX_VOLUME);
 }
@@ -99,15 +104,23 @@ void S2D_SetMusicVolume(int volume) {
 /*
  * Fade out the playing music
  */
-void S2D_FadeOutMusic(int ms) {
+void R2D_FadeOutMusic(int ms) {
   Mix_FadeOutMusic(ms);
 }
 
 
+/*
+ * Get the length of the music in seconds
+ */
+int R2D_GetMusicLength(R2D_Music *mus) {
+  return mus->length;
+}
+
+
 /*
  * Free the music
  */
-void S2D_FreeMusic(S2D_Music *mus) {
+void R2D_FreeMusic(R2D_Music *mus) {
   if (!mus) return;
   Mix_FreeMusic(mus->data);
   free(mus);