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] v13+ - A patch over patch that extends and fixes v13

1119.patch (text/plain), 20.35 KB, created by Vitaly Novichkov on 2019-12-17 14:27:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vitaly Novichkov

Created: 2019-12-17 14:27:03 UTC

Size: 20.35 KB

patch

obsolete

># HG changeset patch
># User Vitaly Novichkov <admin@wohlnet.ru>
># Date 1576592758 -10800
>#      Tue Dec 17 17:25:58 2019 +0300
># Node ID a65f2a931e894d722d77e136aaa382505f5c4fd8
># Parent  f6c47e02b20890d443c1c501a30232502b3489d0
>Bugfixes and clean-ups
>- FLAC: Warning fixes
>- ModPlug: Align function declaration and warning fixes
>- MPG123: Warning fixes
>- OGG: Use simplier and much more accurate ov_time_total()
>- OPUS: Minor warning fix
>- Timidity: Minor warning fix
>- WAV: Minor warning fix
>- MAD: Backporting of a better seekability support from MixerX
>
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_flac.c
>--- a/src/codecs/music_flac.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_flac.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -174,6 +174,8 @@
> {
>     FLAC_Music *data = (FLAC_Music*)client_data;
> 
>+    (void)decoder;
>+
>     /* make sure there is something to be reading */
>     if (*bytes > 0) {
>         *bytes = SDL_RWread (data->src, buffer, sizeof (FLAC__byte), *bytes);
>@@ -195,7 +197,9 @@
> {
>     FLAC_Music *data = (FLAC_Music*)client_data;
> 
>-    if (SDL_RWseek(data->src, absolute_byte_offset, RW_SEEK_SET) < 0) {
>+    (void)decoder;
>+
>+    if (SDL_RWseek(data->src, (Sint64)absolute_byte_offset, RW_SEEK_SET) < 0) {
>         return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
>     } else {
>         return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
>@@ -211,6 +215,8 @@
> 
>     Sint64 pos = SDL_RWtell(data->src);
> 
>+    (void)decoder;
>+
>     if (pos < 0) {
>         return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
>     } else {
>@@ -229,6 +235,8 @@
>     Sint64 pos = SDL_RWtell(data->src);
>     Sint64 length = SDL_RWseek(data->src, 0, RW_SEEK_END);
> 
>+    (void)decoder;
>+
>     if (SDL_RWseek(data->src, pos, RW_SEEK_SET) != pos || length < 0) {
>         /* there was an error attempting to return the stream to the original
>          * position, or the length was invalid. */
>@@ -248,6 +256,8 @@
>     Sint64 pos = SDL_RWtell(data->src);
>     Sint64 end = SDL_RWseek(data->src, 0, RW_SEEK_END);
> 
>+    (void)decoder;
>+
>     /* was the original position equal to the end (a.k.a. the seek didn't move)? */
>     if (pos == end) {
>         /* must be EOF */
>@@ -270,6 +280,8 @@
>     unsigned int i, j, channels;
>     int shift_amount = 0, amount;
> 
>+    (void)decoder;
>+
>     if (!music->stream) {
>         return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
>     }
>@@ -304,8 +316,8 @@
>     if (music->channels == 3) {
>         Sint16 *dst = data;
>         for (i = 0; i < frame->header.blocksize; ++i) {
>-            Sint16 FL = (buffer[0][i] >> shift_amount);
>-            Sint16 FR = (buffer[1][i] >> shift_amount);
>+            Sint16 FL = (Sint16)(buffer[0][i] >> shift_amount);
>+            Sint16 FR = (Sint16)(buffer[1][i] >> shift_amount);
>             Sint16 FCmix = (Sint16)((buffer[2][i] >> shift_amount) * 0.5f);
>             int sample;
> 
>@@ -315,7 +327,7 @@
>             } else if (sample < SDL_MIN_SINT16) {
>                 *dst = SDL_MIN_SINT16;
>             } else {
>-                *dst = sample;
>+                *dst = (Sint16)sample;
>             }
>             ++dst;
> 
>@@ -325,7 +337,7 @@
>             } else if (sample < SDL_MIN_SINT16) {
>                 *dst = SDL_MIN_SINT16;
>             } else {
>-                *dst = sample;
>+                *dst = (Sint16)sample;
>             }
>             ++dst;
>         }
>@@ -333,13 +345,13 @@
>         for (i = 0; i < channels; ++i) {
>             Sint16 *dst = data + i;
>             for (j = 0; j < frame->header.blocksize; ++j) {
>-                *dst = (buffer[i][j] >> shift_amount);
>+                *dst = (Sint16)(buffer[i][j] >> shift_amount);
>                 dst += channels;
>             }
>         }
>     }
>-    amount = frame->header.blocksize * channels * sizeof(*data);
>-    music->pcm_pos += frame->header.blocksize;
>+    amount = (int)(frame->header.blocksize * channels * sizeof(*data));
>+    music->pcm_pos += ((FLAC__uint64)frame->header.blocksize);
>     if ((music->loop == 1) && (music->play_count != 1) &&
>         (music->pcm_pos >= music->loop_end)) {
>         amount -= (music->pcm_pos - music->loop_end) * channels * sizeof(*data);
>@@ -362,7 +374,7 @@
> 
>     /* Time is directly expressed as a sample position */
>     if (SDL_strchr(time, ':') == NULL) {
>-        return SDL_strtoull(time, NULL, 10);
>+        return (FLAC__uint64)SDL_strtoull(time, NULL, 10);
>     }
> 
>     result = 0;
>@@ -371,7 +383,7 @@
>     for (p = time; *p != '\0'; ++p) {
>         if (*p == '.' || *p == ':') {
>             c = *p; *p = '\0';
>-            result = result * 60 + SDL_atoi(num_start);
>+            result = result * 60 + (FLAC__uint64)SDL_atoi(num_start);
>             num_start = p + 1;
>             *p = c;
>         }
>@@ -382,7 +394,7 @@
>         }
>     }
> 
>-    return (result * 60 + SDL_atoi(num_start)) * samplerate_hz;
>+    return (result * 60 + (FLAC__uint64)SDL_atoi(num_start)) * samplerate_hz;
> }
> 
> static void flac_metadata_music_cb(
>@@ -397,6 +409,8 @@
>     char *param, *argument, *value;
>     SDL_bool is_loop_length = SDL_FALSE;
> 
>+    (void)decoder;
>+
>     if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
>         music->sample_rate = metadata->data.stream_info.sample_rate;
>         music->channels = metadata->data.stream_info.channels;
>@@ -409,15 +423,15 @@
>         if (music->channels == 3) {
>             channels = 2;
>         } else {
>-            channels = music->channels;
>+            channels = (int)music->channels;
>         }
> 
>         /* We check for NULL stream later when we get data */
>         SDL_assert(!music->stream);
>-        music->stream = SDL_NewAudioStream(AUDIO_S16SYS, channels, music->sample_rate,
>+        music->stream = SDL_NewAudioStream(AUDIO_S16SYS, (Uint8)channels, (int)music->sample_rate,
>                                           music_spec.format, music_spec.channels, music_spec.freq);
>     } else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
>-        int i;
>+        FLAC__uint32 i;
> 
>         vc  = &metadata->data.vorbis_comment;
>         rate = music->sample_rate;
>@@ -447,8 +461,8 @@
>                 music->loop_len = SDL_strtoull(value, NULL, 10);
>                 is_loop_length = SDL_TRUE;
>             } else if (SDL_strcasecmp(argument, "LOOPEND") == 0) {
>+                music->loop_end = parse_time(value, rate);
>                 is_loop_length = SDL_FALSE;
>-                music->loop_end = parse_time(value, rate);
>             }
>             SDL_free(param);
>         }
>@@ -466,6 +480,9 @@
>                 FLAC__StreamDecoderErrorStatus status,
>                 void *client_data)
> {
>+    (void)decoder;
>+    (void)client_data;
>+
>     /* print an SDL error based on the error status */
>     switch (status) {
>     case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC:
>@@ -502,7 +519,7 @@
>     music->src = src;
>     music->volume = MIX_MAX_VOLUME;
>     music->loop = -1;
>-    music->loop_start = -1;
>+    music->loop_start = 0;
>     music->loop_end = 0;
>     music->loop_len = 0;
>     music->loop_flag = SDL_FALSE;
>@@ -512,6 +529,8 @@
>     if (music->flac_decoder) {
>         init_stage++; /* stage 1! */
>         flac.FLAC__stream_decoder_set_metadata_respond(music->flac_decoder,
>+                    FLAC__METADATA_TYPE_STREAMINFO);
>+        flac.FLAC__stream_decoder_set_metadata_respond(music->flac_decoder,
>                     FLAC__METADATA_TYPE_VORBIS_COMMENT);
> 
>         if (flac.FLAC__stream_decoder_init_stream(
>@@ -553,11 +572,10 @@
>      */
> 
>     full_length = flac.FLAC__stream_decoder_get_total_samples(music->flac_decoder);
>-    if (((music->loop_start >= 0) || (music->loop_end > 0)) &&
>+    if (((music->loop_start > 0) || (music->loop_end > 0)) &&
>         ((music->loop_start < music->loop_end) || (music->loop_end > 0)) &&
>          (music->loop_start < full_length) &&
>          (music->loop_end <= full_length)) {
>-        if (music->loop_start < 0) music->loop_start = 0;
>         if (music->loop_end == 0) music->loop_end = full_length;
>         music->loop = 1;
>     }
>@@ -668,7 +686,7 @@
> static double FLAC_Duration(void *context)
> {
>     FLAC_Music *music = (FLAC_Music *)context;
>-    return (double)music->full_length / music->sample_rate;
>+    return (double)music->full_length / (double)music->sample_rate;
> }
> 
> /* Close the given FLAC_Music object */
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_mad.c
>--- a/src/codecs/music_mad.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_mad.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -148,10 +148,62 @@
>     int status;
>     SDL_AudioStream *audiostream;
> 
>+    double total_length;
>+    int sample_rate;
>+    int sample_position;
>+
>     unsigned char input_buffer[MAD_INPUT_BUFFER_SIZE + MAD_BUFFER_GUARD];
> } MAD_Music;
> 
> 
>+static void read_update_buffer(struct mad_stream *stream, MAD_Music *music);
>+
>+static void calculate_total_time(MAD_Music *music)
>+{
>+    mad_timer_t time = mad_timer_zero;
>+    struct mad_header header;
>+    struct mad_stream stream;
>+    mad_header_init(&header);
>+    mad_stream_init(&stream);
>+
>+    MP3_RWseek(&music->mp3file, 0, RW_SEEK_SET);
>+
>+    while (1)
>+    {
>+        read_update_buffer(&stream, music);
>+
>+        if (mad_header_decode(&header, &stream) == -1) {
>+            if (MAD_RECOVERABLE(stream.error)) {
>+                if ((music->status & MS_input_error) == 0) {
>+                    continue;
>+                }
>+                break;
>+            } else if (stream.error == MAD_ERROR_BUFLEN) {
>+                if ((music->status & MS_input_error) == 0) {
>+                    continue;
>+                }
>+                break;
>+            } else {
>+                Mix_SetError("mad_frame_decode() failed, corrupt stream?");
>+                music->status |= MS_decode_error;
>+                break;
>+            }
>+        }
>+
>+        music->sample_rate = (int)header.samplerate;
>+        mad_timer_add(&time, header.duration);
>+    }
>+
>+    music->total_length = (double)(mad_timer_count(time, (enum mad_units)music->sample_rate)) / (double)music->sample_rate;
>+    mad_stream_finish(&stream);
>+    mad_header_finish(&header);
>+    SDL_memset(music->input_buffer, 0, sizeof(music->input_buffer));
>+
>+    music->status = 0;
>+
>+    MP3_RWseek(&music->mp3file, 0, RW_SEEK_SET);
>+}
>+
> static int MAD_Seek(void *context, double position);
> 
> static void *MAD_CreateFromRW(SDL_RWops *src, int freesrc)
>@@ -173,6 +225,8 @@
>         return NULL;
>     }
> 
>+    calculate_total_time(music);
>+
>     mad_stream_init(&music->stream);
>     mad_frame_init(&music->frame);
>     mad_synth_init(&music->synth);
>@@ -200,10 +254,10 @@
> /* Reads the next frame from the file.
>    Returns true on success or false on failure.
>  */
>-static SDL_bool read_next_frame(MAD_Music *music)
>+static void read_update_buffer(struct mad_stream *stream, MAD_Music *music)
> {
>-    if (music->stream.buffer == NULL ||
>-        music->stream.error == MAD_ERROR_BUFLEN) {
>+    if (stream->buffer == NULL ||
>+        stream->error == MAD_ERROR_BUFLEN) {
>         size_t read_size;
>         size_t remaining;
>         unsigned char *read_start;
>@@ -211,9 +265,9 @@
>         /* There might be some bytes in the buffer left over from last
>            time.    If so, move them down and read more bytes following
>            them. */
>-        if (music->stream.next_frame != NULL) {
>-            remaining = music->stream.bufend - music->stream.next_frame;
>-            memmove(music->input_buffer, music->stream.next_frame, remaining);
>+        if (stream->next_frame != NULL) {
>+            remaining = (size_t)(stream->bufend - stream->next_frame);
>+            memmove(music->input_buffer, stream->next_frame, remaining);
>             read_start = music->input_buffer + remaining;
>             read_size = MAD_INPUT_BUFFER_SIZE - remaining;
> 
>@@ -239,10 +293,18 @@
>         }
> 
>         /* Now feed those bytes into the libmad stream. */
>-        mad_stream_buffer(&music->stream, music->input_buffer,
>+        mad_stream_buffer(stream, music->input_buffer,
>                                             read_size + remaining);
>-        music->stream.error = MAD_ERROR_NONE;
>+        stream->error = MAD_ERROR_NONE;
>     }
>+}
>+
>+/* Reads the next frame from the file.
>+   Returns true on success or false on failure.
>+ */
>+static SDL_bool read_next_frame(MAD_Music *music)
>+{
>+    read_update_buffer(&music->stream, music);
> 
>     /* Now ask libmad to extract a frame from the data we just put in
>        its buffer. */
>@@ -329,6 +391,7 @@
>         }
>     }
> 
>+    music->sample_position += nsamples;
>     result = SDL_AudioStreamPut(music->audiostream, buffer, (int)(nsamples * nchannels * sizeof(Sint16)));
>     SDL_stack_free(buffer);
> 
>@@ -389,6 +452,8 @@
>     int_part = (int)position;
>     mad_timer_set(&target, (unsigned long)int_part, (unsigned long)((position - int_part) * 1000000), 1000000);
> 
>+    music->sample_position = (int)(position * music->sample_rate);
>+
>     if (mad_timer_compare(music->next_frame_start, target) > 0) {
>         /* In order to seek backwards in a VBR file, we have to rewind and
>            start again from the beginning.    This isn't necessary if the
>@@ -400,6 +465,8 @@
>         music->status &= ~MS_error_flags;
> 
>         MP3_RWseek(&music->mp3file, 0, RW_SEEK_SET);
>+        /* Avoid junk chunk be played after seek */
>+        SDL_memset(music->input_buffer, 0, sizeof(music->input_buffer));
>     }
> 
>     /* Now we have to skip frames until we come to the right one.
>@@ -421,6 +488,12 @@
>     return 0;
> }
> 
>+static double MAD_Duration(void *context)
>+{
>+    MAD_Music *music = (MAD_Music *)context;
>+    return music->total_length;
>+}
>+
> static void MAD_Delete(void *context)
> {
>     MAD_Music *music = (MAD_Music *)context;
>@@ -455,7 +528,7 @@
>     NULL,   /* IsPlaying */
>     MAD_GetAudio,
>     MAD_Seek,
>-    NULL    /* Duration */
>+    MAD_Duration,
>     NULL,   /* Pause */
>     NULL,   /* Resume */
>     NULL,   /* Stop */
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_modplug.c
>--- a/src/codecs/music_modplug.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_modplug.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -39,10 +39,10 @@
>     void (*ModPlug_Unload)(ModPlugFile* file);
>     int  (*ModPlug_Read)(ModPlugFile* file, void* buffer, int size);
>     void (*ModPlug_Seek)(ModPlugFile* file, int millisecond);
>+    int  (*ModPlug_GetLength)(ModPlugFile* file);
>     void (*ModPlug_GetSettings)(ModPlug_Settings* settings);
>     void (*ModPlug_SetSettings)(const ModPlug_Settings* settings);
>     void (*ModPlug_SetMasterVolume)(ModPlugFile* file,unsigned int cvol);
>-    int  (*ModPlug_GetLength)(ModPlugFile* file);
> } modplug_loader;
> 
> static modplug_loader modplug = {
>@@ -82,10 +82,10 @@
>         FUNCTION_LOADER(ModPlug_Unload, void (*)(ModPlugFile* file))
>         FUNCTION_LOADER(ModPlug_Read, int  (*)(ModPlugFile* file, void* buffer, int size))
>         FUNCTION_LOADER(ModPlug_Seek, void (*)(ModPlugFile* file, int millisecond))
>+        FUNCTION_LOADER(ModPlug_GetLength, int (*)(ModPlugFile* file))
>         FUNCTION_LOADER(ModPlug_GetSettings, void (*)(ModPlug_Settings* settings))
>         FUNCTION_LOADER(ModPlug_SetSettings, void (*)(const ModPlug_Settings* settings))
>         FUNCTION_LOADER(ModPlug_SetMasterVolume, void (*)(ModPlugFile* file,unsigned int cvol))
>-        FUNCTION_LOADER(ModPlug_GetLength, int (*)(ModPlugFile* file))
>     }
>     ++modplug.loaded;
> 
>@@ -270,7 +270,7 @@
> static double MODPLUG_Duration(void *context)
> {
>     MODPLUG_Music *music = (MODPLUG_Music *)context;
>-    return modplug.ModPlug_GetLength(music->file) / 1000.0;
>+    return (double)(modplug.ModPlug_GetLength(music->file)) / 1000.0;
> }
> 
> /* Close the given modplug stream */
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_mpg123.c
>--- a/src/codecs/music_mpg123.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_mpg123.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -425,9 +425,9 @@
> {
>     MPG123_Music *music = (MPG123_Music *)context;
>     if (music->total_length < 0) {
>-        return -1;
>+        return -1.0;
>     }
>-    return (double)music->total_length / music->sample_rate;
>+    return (double)music->total_length / (double)music->sample_rate;
> }
> 
> static void MPG123_Delete(void *context)
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_ogg.c
>--- a/src/codecs/music_ogg.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_ogg.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -55,10 +55,13 @@
> #else
>     int (*ov_time_seek)(OggVorbis_File *vf,double pos);
> #endif
>+#ifdef OGG_USE_TREMOR
>+    ogg_int64_t (*ov_time_total)(OggVorbis_File *vf, int i);
>+#else
>+    double (*ov_time_total)(OggVorbis_File *vf, int i);
>+#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 = {
>@@ -99,15 +102,14 @@
> #ifdef OGG_USE_TREMOR
>         FUNCTION_LOADER(ov_read, long (*)(OggVorbis_File *,char *,int,int *))
>         FUNCTION_LOADER(ov_time_seek, int (*)(OggVorbis_File *,ogg_int64_t))
>+        FUNCTION_LOADER(ov_time_total, ogg_int64_t (*)(OggVorbis_File *, int))
> #else
>         FUNCTION_LOADER(ov_read, long (*)(OggVorbis_File *,char *,int,int,int,int,int *))
>         FUNCTION_LOADER(ov_time_seek, int (*)(OggVorbis_File *,double))
>+        FUNCTION_LOADER(ov_time_total, double (*)(OggVorbis_File *, int))
> #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;
> 
>@@ -321,12 +323,12 @@
>         }
> 
>         if (SDL_strcasecmp(argument, "LOOPSTART") == 0)
>-            music->loop_start = parse_time(value, rate);
>+            music->loop_start = (ogg_int64_t)parse_time(value, rate);
>         else if (SDL_strcasecmp(argument, "LOOPLENGTH") == 0) {
>             music->loop_len = (ogg_int64_t)SDL_strtoull(value, NULL, 10);
>             is_loop_length = SDL_TRUE;
>         } else if (SDL_strcasecmp(argument, "LOOPEND") == 0) {
>-            music->loop_end = parse_time(value, rate);
>+            music->loop_end = (ogg_int64_t)parse_time(value, rate);
>             is_loop_length = SDL_FALSE;
>         }
>         SDL_free(param);
>@@ -468,16 +470,11 @@
> static double OGG_Duration(void *context)
> {
>     OGG_music *music = (OGG_music *)context;
>-    double 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.0 / bitrate;
>+#ifdef OGG_USE_TREMOR
>+    return (double)(vorbis.ov_time_total(&music->vf, -1)) / 1000.0;
>+#else
>+    return vorbis.ov_time_total(&music->vf, -1);
>+#endif
> }
> 
> /* Close the given OGG stream */
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_opus.c
>--- a/src/codecs/music_opus.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_opus.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -455,7 +455,7 @@
> static double OPUS_Duration(void *context)
> {
>     OPUS_music *music = (OPUS_music *)context;
>-    return music->full_length / 48000.0;
>+    return (double)music->full_length / 48000.0;
> }
> 
> /* Close the given Opus stream */
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_timidity.c
>--- a/src/codecs/music_timidity.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_timidity.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -209,7 +209,7 @@
> static double TIMIDITY_Duration(void *context)
> {
>     TIMIDITY_Music *music = (TIMIDITY_Music *)context;
>-    return Timidity_GetSongLength(music->song) / 1000.0;
>+    return (double)(Timidity_GetSongLength(music->song)) / 1000;
> }
> 
> static void TIMIDITY_Delete(void *context)
>diff -r f6c47e02b208 -r a65f2a931e89 src/codecs/music_wav.c
>--- a/src/codecs/music_wav.c	Tue Dec 17 15:55:10 2019 +0300
>+++ b/src/codecs/music_wav.c	Tue Dec 17 17:25:58 2019 +0300
>@@ -580,11 +580,11 @@
> }
> 
> /* Return music duration in seconds */
>-static double WAW_Duration(void *context)
>+static double WAV_Duration(void *context)
> {
>     WAV_Music *music = (WAV_Music *)context;
>     Sint64 sample_size = music->spec.freq * music->samplesize;
>-    return (double)(music->stop - music->start) / sample_size;
>+    return (double)(music->stop - music->start) / (double)(sample_size);
> }
> 
> /* Close the given WAV stream */
>@@ -1096,7 +1096,7 @@
>     NULL,   /* IsPlaying */
>     WAV_GetAudio,
>     WAV_Seek,   /* Seek */
>-    WAW_Duration,
>+    WAV_Duration,
>     NULL,   /* Pause */
>     NULL,   /* Resume */
>     NULL,   /* Stop */

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.