diff options
| author | Max Kellermann <max@duempel.org> | 2011-07-20 21:46:05 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-07-20 21:46:05 +0200 |
| commit | 0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3 (patch) | |
| tree | d08d18c852febad9d6da94dfbe31545dcf93b5d0 /src/pipe.c | |
| parent | 57936a13741c09fa54a33a53ed05ac0d996e4807 (diff) | |
| parent | 838f7cd210dbd3f071d48d54c168c123c3d20c58 (diff) | |
| download | mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.gz mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.tar.xz mpd-0ea4c970d794d535ae6efb4d0ae2d3fe37980ae3.zip | |
Merge branch 'v0.16.x'
Conflicts:
src/player_thread.c
src/playlist_control.c
Diffstat (limited to '')
| -rw-r--r-- | src/pipe.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/pipe.c b/src/pipe.c index db80c2b2d..d8131432f 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -187,5 +187,8 @@ music_pipe_push(struct music_pipe *mp, struct music_chunk *chunk) unsigned music_pipe_size(const struct music_pipe *mp) { - return mp->size; + g_mutex_lock(mp->mutex); + unsigned size = mp->size; + g_mutex_unlock(mp->mutex); + return size; } |