Merge branch 'v0.17.x'

Conflicts:
	src/queue_save.c

1 files changed, 15 insertions, 0 deletions

diff --git a/src/player_control.h b/src/player_control.h
index c16dbcb9f..3b536b8ba 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -137,6 +137,15 @@ struct player_control {
 	float mixramp_db;
 	float mixramp_delay_seconds;
 	double total_play_time;
+
+	/**
+	 * If this flag is set, then the player will be auto-paused at
+	 * the end of the song, before the next song starts to play.
+	 *
+	 * This is a copy of the queue's "single" flag most of the
+	 * time.
+	 */
+	bool border_pause;
 };
 
 struct player_control *
@@ -225,6 +234,12 @@ pc_set_pause(struct player_control *pc, bool pause_flag);
 void
 pc_pause(struct player_control *pc);
 
+/**
+ * Set the player's #border_pause flag.
+ */
+void
+pc_set_border_pause(struct player_control *pc, bool border_pause);
+
 void
 pc_kill(struct player_control *pc);