Clean out player_+thread_please_stop references.

diff --git a/player.c b/player.c
index 8cb09122449f5dcdafcb9f0f461a3982a2dfb85d..3f697c42bf40b33f43897f61de475f6f80fa01a3 100644 (file)
--- 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 246e7b5e4bd202cbc7ccdd44f6487981609a0b7a..793476e6ec50c20aaa9dd5d774795572e7ddf540 100644 (file)
--- 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