oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.16.x'

Browse Source
This commit is contained in:
Max Kellermann 2011-12-24 18:15:17 +01:00
commit 43c5058682
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -35,6 +35,9 @@ ver 0.16.7 (2011/??/??)
* output: * output:
- httpd: fix excessive buffering - httpd: fix excessive buffering
- openal: force 16 bit playback, as 8 bit doesn't work - openal: force 16 bit playback, as 8 bit doesn't work
- osx: remove sleep call from render callback
- osx: clear render buffer when there's not enough data
* fix moving after current song
ver 0.16.6 (2011/12/01) ver 0.16.6 (2011/12/01)

9
src/output/osx_output_plugin.c
View File

@ -152,7 +152,6 @@ osx_render(void *vdata,
g_mutex_lock(od->mutex); g_mutex_lock(od->mutex);
bytes_to_copy = MIN(od->len, buffer_size); bytes_to_copy = MIN(od->len, buffer_size);
buffer_size = bytes_to_copy;
od->len -= bytes_to_copy; od->len -= bytes_to_copy;
trailer_length = od->buffer_size - od->pos; trailer_length = od->buffer_size - od->pos;
@ -174,11 +173,9 @@ osx_render(void *vdata,
g_cond_signal(od->condition); g_cond_signal(od->condition);
g_mutex_unlock(od->mutex); g_mutex_unlock(od->mutex);
buffer->mDataByteSize = buffer_size; if (bytes_to_copy < buffer_size)
memset((unsigned char*)buffer->mData + bytes_to_copy, 0,
if (!buffer_size) { buffer_size - bytes_to_copy);
g_usleep(1000);
}
return 0; return 0;
} }

2
src/playlist_edit.c
View File

@ -418,7 +418,7 @@ playlist_move_range(struct playlist *playlist, struct player_control *pc,
playlist->current) playlist->current)
: -1; : -1;
if (to < 0 && playlist->current >= 0) { if (to < 0 && playlist->current >= 0) {
if (start <= (unsigned)currentSong && (unsigned)currentSong <= end) if (start <= (unsigned)currentSong && (unsigned)currentSong < end)
/* no-op, can't be moved to offset of itself */ /* no-op, can't be moved to offset of itself */
return PLAYLIST_RESULT_SUCCESS; return PLAYLIST_RESULT_SUCCESS;
to = (currentSong + abs(to)) % queue_length(&playlist->queue); to = (currentSong + abs(to)) % queue_length(&playlist->queue);