From: Mike Brady <mikebrady@eircom.net>
Date: Sun, 15 Jul 2018 15:25:56 +0000 (+0100)
Subject: Clean out player_+thread_please_stop references.
X-Git-Tag: 3.3RC0~286^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a8a86382539cac7ce79d2abea7dd3208713a61b;p=thirdparty%2Fshairport-sync.git

Clean out player_+thread_please_stop references.
---

diff --git a/player.c b/player.c
index 8cb09122..3f697c42 100644
--- a/player.c
+++ b/player.c
@@ -2703,7 +2703,8 @@ int player_play(rtsp_conn_info *conn) {
 }
 
 int player_stop(rtsp_conn_info *conn) {
-  // will only ever be called by the connection thread
+  // note -- this may be called from another connection thread or from the player thread itself
+  // as well as from the conn's own thread.
   debug(3, "player_stop");
   if (conn->player_thread) {
     debug(2, "player_thread cancel...");
diff --git a/player.h b/player.h
index 246e7b5e..793476e6 100644
--- a/player.h
+++ b/player.h
@@ -98,7 +98,6 @@ typedef struct {
   alac_file *decoder_info;
   uint64_t packet_count;
   int connection_state_to_output;
-  int player_thread_please_stop;
   uint64_t first_packet_time_to_play;
   int64_t time_since_play_started; // nanoseconds
                                    // stats