We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] V4 (fixes V2 and V3 so it behaves at runtime)

duration-v4.diff (text/plain), 7.73 KB, created by Ozkan Sezer on 2019-07-27 20:40:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2019-07-27 20:40:53 UTC

Size: 7.73 KB

patch

obsolete

>diff --git a/SDL_mixer.h b/SDL_mixer.h
>--- a/SDL_mixer.h
>+++ b/SDL_mixer.h
>@@ -618,6 +618,11 @@ extern DECLSPEC int SDLCALL Mix_PlayingM
> /* Stop music and set external music playback command */
> extern DECLSPEC int SDLCALL Mix_SetMusicCMD(const char *command);
> 
>+/* Return music duration, if NULL is pass, return current playing music durration
>+   return -1 on error
>+ */
>+extern DECLSPEC int SDLCALL Mix_MusicDuration(Mix_Music *music);
>+
> /* Synchro value is set by MikMod from modules while playing */
> extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
> extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);
>diff --git a/music.c b/music.c
>--- a/music.c
>+++ b/music.c
>@@ -796,6 +796,37 @@ int Mix_SetMusicPosition(double position
>     return(retval);
> }
> 
>+static int music_duration_int(Mix_Music *music)
>+{
>+    if (music->interface->duration) {
>+	/*printf("get duration %p\n", music->interface->duration);*/
>+	return music->interface->duration(music->context);
>+    } else {
>+	Mix_SetError("Duration not implemented for music type");
>+	return -1;
>+    }
>+}
>+
>+int Mix_MusicDuration(Mix_Music *music)
>+{
>+    int retval;
>+
>+    Mix_LockAudio();
>+
>+    if (music) {
>+	retval = music_duration_int(music);
>+	printf("---\n");
>+    } else if (music_playing) {
>+	retval = music_duration_int(music_playing);
>+    } else {
>+        Mix_SetError("music is NULL and no playing music");
>+        retval = -1;
>+    }
>+    Mix_UnlockAudio();
>+
>+    return(retval);
>+}
>+
> /* Set the music's initial volume */
> static void music_internal_initialize_volume(void)
> {
>diff --git a/music.h b/music.h
>--- a/music.h
>+++ b/music.h
>@@ -100,6 +100,8 @@ typedef struct
>     /* Unload the library */
>     void (*Unload)(void);
> 
>+    /* Get Music duration in ???? */
>+    int (*duration)(void *music);
> } Mix_MusicInterface;
> 
> 
>diff --git a/music_mpg123.c b/music_mpg123.c
>--- a/music_mpg123.c
>+++ b/music_mpg123.c
>@@ -23,7 +23,7 @@
> 
> #ifdef MUSIC_MP3_MPG123
> 
>-#include <stdio.h>      // For SEEK_SET
>+#include <stdio.h>      /* For SEEK_SET */
> 
> #include "SDL_assert.h"
> #include "SDL_loadso.h"
>@@ -51,6 +51,10 @@ typedef struct {
>     int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done );
>     int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
>     off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence );
>+    int (*mpg123_framelength)(mpg123_handle *mh);
>+    int (*mpg123_position)(mpg123_handle *mh, off_t frame_offset, off_t buffered_bytes,  off_t *current_frame, off_t *frames_left, double *current_seconds, double *seconds_left);
>+    int (*mpg123_scan)(mpg123_handle *mh);
>+    int (*mpg123_info)(mpg123_handle *mh, struct mpg123_frameinfo *mi);
>     const char* (*mpg123_strerror)(mpg123_handle *mh);
> } mpg123_loader;
> 
>@@ -98,8 +102,18 @@ static int MPG123_Load(void)
>         FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ))
>         FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
>         FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence ))
>+        FUNCTION_LOADER(mpg123_position, int (*)(mpg123_handle *mh, off_t frame_offset, off_t buffered_bytes,  off_t *current_frame, off_t *frames_left, double *current_seconds, double *seconds_left ))
>+        FUNCTION_LOADER(mpg123_scan, int (*)(mpg123_handle *mh))
>+        FUNCTION_LOADER(mpg123_info, int (*)(mpg123_handle *mh, struct mpg123_frameinfo *mi))
>         FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh))
>     }
>+#ifdef MPG123_DYNAMIC
>+    mpg123.mpg123_framelength = (int (*)(mpg123_handle *)) SDL_LoadFunction(mpg123.handle, "mpg123_framelength");
>+#elif (MPG123_API_VERSION < 42)
>+    mpg123.mpg123_framelength = NULL;
>+#else
>+    mpg123.mpg123_framelength = mpg123_framelength;
>+#endif
>     ++mpg123.loaded;
> 
>     return 0;
>@@ -274,6 +288,11 @@ static void *MPG123_CreateFromRW(SDL_RWo
>         return NULL;
>     }
> 
>+    /* this is here so that mpg123_position() behaves. */
>+    if (!mpg123.mpg123_framelength) {
>+        mpg123.mpg123_scan(music->handle);
>+    }
>+
>     music->freesrc = freesrc;
>     return music;
> }
>@@ -376,6 +395,47 @@ static int MPG123_Seek(void *context, do
>     return 0;
> }
> 
>+static int old_mpg123_duration(MPG123_Music *music)
>+{
>+    off_t buffered_bytes = 0;
>+    off_t current_frame;
>+    off_t frames_left;
>+    double current_seconds;
>+    double seconds_left;
>+
>+    mpg123.mpg123_position(music->handle, 0, buffered_bytes, &current_frame,
>+			   &frames_left, &current_seconds, &seconds_left);
>+    return seconds_left * 1000;
>+}
>+
>+static int new_mpg123_duration(MPG123_Music *music)
>+{
>+    struct mpg123_frameinfo fi;
>+    int tot_frm = mpg123.mpg123_framelength(music->handle);
>+    int r;
>+
>+    if (tot_frm < 0) {
>+	return Mix_SetError("mpg123_framelength: %s",
>+			    mpg_err(music->handle, (int)-tot_frm));
>+    }
>+    if ((r = mpg123.mpg123_info(music->handle, &fi)) < 0) {
>+	return Mix_SetError("mpg123_info: %s",
>+			    mpg_err(music->handle, (int)-r));
>+
>+    }
>+    return tot_frm * (fi.framesize  * 8) / fi.bitrate;
>+}
>+
>+static int MPG123_Duration(void *context)
>+{
>+    MPG123_Music *music = (MPG123_Music *)context;
>+
>+    if (mpg123.mpg123_framelength)
>+        return new_mpg123_duration(music);
>+
>+    return old_mpg123_duration(music);
>+}
>+
> static void MPG123_Delete(void *context)
> {
>     MPG123_Music *music = (MPG123_Music *)context;
>@@ -423,7 +483,8 @@ Mix_MusicInterface Mix_MusicInterface_MP
>     NULL,   /* Stop */
>     MPG123_Delete,
>     MPG123_Close,
>-    MPG123_Unload
>+    MPG123_Unload,
>+    MPG123_Duration
> };
> 
> #endif /* MUSIC_MP3_MPG123 */
>diff --git a/music_ogg.c b/music_ogg.c
>--- a/music_ogg.c
>+++ b/music_ogg.c
>@@ -56,6 +56,8 @@ typedef struct {
> #endif
>     int (*ov_pcm_seek)(OggVorbis_File *vf, ogg_int64_t pos);
>     ogg_int64_t (*ov_pcm_tell)(OggVorbis_File *vf);
>+    long (*ov_bitrate)(OggVorbis_File *vf, int i);
>+    ogg_int64_t (*ov_raw_total)(OggVorbis_File *vf,int i);
> } vorbis_loader;
> 
> static vorbis_loader vorbis = {
>@@ -102,6 +104,9 @@ static int OGG_Load(void)
> #endif
>         FUNCTION_LOADER(ov_pcm_seek, int (*)(OggVorbis_File *,ogg_int64_t))
>         FUNCTION_LOADER(ov_pcm_tell, ogg_int64_t (*)(OggVorbis_File *))
>+        FUNCTION_LOADER(ov_bitrate, long (*)(OggVorbis_File *, int))
>+        FUNCTION_LOADER(ov_raw_total, ogg_int64_t (*)(OggVorbis_File *, int))
>+
>     }
>     ++vorbis.loaded;
> 
>@@ -410,6 +415,21 @@ static int OGG_Seek(void *context, doubl
>     return 0;
> }
> 
>+static int OGG_Duration(void *context)
>+{
>+    OGG_music *music = (OGG_music *)context;
>+    long bitrate = vorbis.ov_bitrate(&music->vf, -1);
>+    ogg_int64_t tot_byte = vorbis.ov_raw_total(&music->vf, -1);
>+
>+    if (bitrate < 0) {
>+        return set_ov_error("ov_biterate", bitrate);
>+    }
>+    if (tot_byte < 0) {
>+        return set_ov_error("ov_raw_total", tot_byte);
>+    }
>+    return tot_byte * 8 / bitrate * 1000;
>+}
>+
> /* Close the given OGG stream */
> static void OGG_Delete(void *context)
> {
>@@ -450,6 +470,7 @@ Mix_MusicInterface Mix_MusicInterface_OG
>     OGG_Delete,
>     NULL,   /* Close */
>     OGG_Unload,
>+    OGG_Duration
> };
> 
> #endif /* MUSIC_OGG */
>diff --git a/playmus.c b/playmus.c
>--- a/playmus.c
>+++ b/playmus.c
>@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
>         }
> 
>         /* Play and then exit */
>-        SDL_Log("Playing %s\n", argv[i]);
>+        SDL_Log("Playing %s, duration %d\n", argv[i], Mix_MusicDuration(music));
>         Mix_FadeInMusic(music,looping,2000);
>         while (!next_track && (Mix_PlayingMusic() || Mix_PausedMusic())) {
>             if(interactive)

Actions: View | Diff

Attachments on bug 4715: 3875 | 3903 | 3904 | 3905 | 3907 | 4072 | 4097 | 4098 | 4099 | 4101 | 4102 | 4103 | 4104 | 4106 | 4107 | 4108 | 4109

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.