Merge branch 'v0.17.x'

Conflicts:
	src/queue_save.c
This commit is contained in:
Max Kellermann
2012-08-25 10:28:33 +02:00
12 changed files with 89 additions and 17 deletions
+8
View File
@@ -204,6 +204,14 @@ pc_set_pause(struct player_control *pc, bool pause_flag)
player_unlock(pc);
}
void
pc_set_border_pause(struct player_control *pc, bool border_pause)
{
player_lock(pc);
pc->border_pause = border_pause;
player_unlock(pc);
}
void
pc_get_status(struct player_control *pc, struct player_status *status)
{