diff options
Diffstat (limited to 'src/player.c')
| -rw-r--r-- | src/player.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/player.c b/src/player.c index b743ee8..f53feaa 100644 --- a/src/player.c +++ b/src/player.c @@ -156,9 +156,15 @@ static WaitressCbReturn_t BarPlayerAACCb (void *ptr, size_t size, for (i = 0; i < frameInfo.samples; i++) { aacDecoded[i] = applyReplayGain (aacDecoded[i], player->scale); } + + int oldstate; + pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate); /* ao_play needs bytes: 1 sample = 16 bits = 2 bytes */ ao_play (player->audioOutDevice, (char *) aacDecoded, frameInfo.samples * 2); + pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &oldstate); + pthread_testcancel(); + /* add played frame length to played time, explained below */ player->songPlayed += (unsigned long long int) frameInfo.samples * (unsigned long long int) BAR_PLAYER_MS_TO_S_FACTOR / @@ -385,9 +391,13 @@ static WaitressCbReturn_t BarPlayerMp3Cb (void *ptr, size_t size, * be visible to user (ugly, but mp3 decoding != aac decoding) */ player->mode = PLAYER_RECV_DATA; } + int oldstate; + pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate); /* samples * length * channels */ ao_play (player->audioOutDevice, (char *) madDecoded, player->mp3Synth.pcm.length * 2 * 2); + pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &oldstate); + pthread_testcancel(); /* avoid division by 0 */ if (player->mode == PLAYER_RECV_DATA) { |