Move group ID store to the conn. Fix the size of the groupContainsGroupLeader plist...

diff --git a/common.h b/common.h
index 4572d198e4eac3d9f0bc89fb3e28526de3adce1a..9c3496f6a1c79e262069249503e1f8f7a22deb87 100644 (file)
--- a/common.h
+++ b/common.h
@@ -302,7 +302,6 @@ typedef struct {
   char *airplay_device_id; // for the Bonjour advertisement and the GETINFO PList
   char *airplay_pin;       // non-NULL, 4 char PIN, if required for pairing
   char *airplay_pi;        // UUID in the Bonjour advertisement and the GETINFO Plist
-  char *airplay_gid;       // UUID in the Bonjour advertisement -- initially the same as the pi
 #endif
 } shairport_cfg;
 

diff --git a/player.h b/player.h
index 050194177fda29500634152b435220122208c0ef..e8d661b5b84830a6bfeaa674df6058ec4f36f270 100644 (file)
--- a/player.h
+++ b/player.h
@@ -287,6 +287,7 @@ typedef struct {
   clock_status_t clock_status;
 
 #ifdef CONFIG_AIRPLAY_2
+  char *airplay_gid;       // UUID in the Bonjour advertisement -- if NULL, the group UUID is the same as the pi UUID
   airplay_t airplay_type; // are we using AirPlay 1 or AirPlay 2 protocol on this connection?
   airplay_stream_t airplay_stream_type; // is it realtime audio or buffered audio...
   timing_t timing_type;                 // are we using NTP or PTP on this connection?
@@ -332,8 +333,8 @@ typedef struct {
   unsigned char *session_key; // needs to be free'd at the end
   uint64_t frames_packet;
   uint64_t type;
-  uint64_t networkTimeTimelineID;    // the clock ID used by the player
-  uint64_t groupContainsGroupLeader; // information coming from the SETUP
+  uint64_t networkTimeTimelineID;   // the clock ID used by the player
+  uint8_t groupContainsGroupLeader; // information coming from the SETUP
 
   char *ap2_timing_peer_list_message;