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] Patch - music_flac.c and music.ogg.c - add support for play count when looping

music_flac_and_ogg_play_count.patch (text/plain), 1.75 KB, created by Michael Day on 2019-11-24 03:09:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Day

Created: 2019-11-24 03:09:04 UTC

Size: 1.75 KB

patch

obsolete

>diff --git a/src/codecs/music_flac.c b/src/codecs/music_flac.c
>index a96d8a0..8195666 100644
>--- a/src/codecs/music_flac.c
>+++ b/src/codecs/music_flac.c
>@@ -339,7 +339,8 @@ static FLAC__StreamDecoderWriteStatus flac_write_music_cb(
>     }
>     amount = frame->header.blocksize * channels * sizeof(*data);
>     music->pcm_pos += frame->header.blocksize;
>-    if ((music->loop == 1) && (music->pcm_pos >= music->loop_end)) {
>+    if ((music->loop == 1) && (music->play_count != 1) &&
>+        (music->pcm_pos >= music->loop_end)) {
>         amount -= (music->pcm_pos - music->loop_end) * channels * sizeof(*data);
>         music->loop_flag = SDL_TRUE;
>     }
>@@ -609,6 +610,11 @@ static int FLAC_GetSome(void *context, void *data, int bytes, SDL_bool *done)
>             flac.FLAC__stream_decoder_flush(music->flac_decoder);
>             return -1;
>         } else {
>+            int play_count = -1;
>+            if (music->play_count > 0) {
>+                play_count = (music->play_count - 1);
>+            }
>+            music->play_count = play_count;
>             music->loop_flag = SDL_FALSE;
>         }
>     }
>diff --git a/src/codecs/music_ogg.c b/src/codecs/music_ogg.c
>index 4a7df79..88bde41 100644
>--- a/src/codecs/music_ogg.c
>+++ b/src/codecs/music_ogg.c
>@@ -401,7 +401,7 @@ static int OGG_GetSome(void *context, void *data, int bytes, SDL_bool *done)
>     }
> 
>     pcmPos = vorbis.ov_pcm_tell(&music->vf);
>-    if ((music->loop == 1) && (music->play_count != 0) && (pcmPos >= music->loop_end)) {
>+    if ((music->loop == 1) && (music->play_count != 1) && (pcmPos >= music->loop_end)) {
>         amount -= (int)((pcmPos - music->loop_end) * music->vi.channels) * (int)sizeof(Sint16);
>         result = vorbis.ov_pcm_seek(&music->vf, music->loop_start);
>         if (result < 0) {

Actions: View | Diff

Attachments on bug 4876: 4068 | 4069 | 4070

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.