From: Mike Brady <mikebrady@eircom.net>
Date: Fri, 10 Mar 2017 21:19:30 +0000 (+0000)
Subject: Resore ID of ShairportSync in Bonjour advertisiment and fix a noisy bug when a frame... 
X-Git-Tag: 3.0.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=158c94bbb6eef30e18169f6eee02b5ff43d821c0;p=thirdparty%2Fshairport-sync.git

Resore ID of ShairportSync in Bonjour advertisiment and fix a noisy bug when a frame was missing
---

diff --git a/mdns.h b/mdns.h
index c4fe4bc6..7aa9dbb2 100644
--- a/mdns.h
+++ b/mdns.h
@@ -24,7 +24,7 @@ typedef struct {
 //      "sr=44100", "vn=3", "txtvers=1", config.password ? "pw=true" : "pw=false"
 
 #define MDNS_RECORD_WITH_METADATA                                                                  \
-  "sf=0x4", "fv=76400.10", "am=AirPort4,107", "vs=105.1", "tp=TCP,UDP", "vn=65537",                \
+  "sf=0x4", "fv=76400.10", "am=ShairportSync", "vs=105.1", "tp=TCP,UDP", "vn=65537",                \
       METADATA_EXPRESSION, "ss=16", "sr=44100", "da=true", "sv=false", "et=0,1", "ek=1", "cn=0,1", \
       "ch=2", "txtvers=1", config.password ? "pw=true" : "pw=false"
 
@@ -35,7 +35,7 @@ typedef struct {
 //      "txtvers=1", config.password ? "pw=true" : "pw=false"
 
 #define MDNS_RECORD_WITHOUT_METADATA                                                               \
-  "sf=0x4", "fv=76400.10", "am=AirPort4,107", "vs=105.1", "tp=TCP,UDP", "vn=65537", "ss=16",       \
+  "sf=0x4", "fv=76400.10", "am=ShairportSync", "vs=105.1", "tp=TCP,UDP", "vn=65537", "ss=16",       \
       "sr=44100", "da=true", "sv=false", "et=0,1", "ek=1", "cn=0,1", "ch=2", "txtvers=1",          \
       config.password ? "pw=true" : "pw=false"
 
diff --git a/player.c b/player.c
index 9b265279..b7ca2dd7 100644
--- a/player.c
+++ b/player.c
@@ -1181,7 +1181,6 @@ static abuf_t *buffer_get_frame(void) {
   if (!curframe->ready) {
     // debug(1, "Supplying a silent frame for frame %u", read);
     missing_packets++;
-    memset(curframe->data, 0, input_bytes_per_frame * max_frames_per_packet);
     curframe->timestamp = 0;
   }
   curframe->ready = 0;
@@ -1698,14 +1697,7 @@ static void *player_thread_func(void *arg) {
           // debug(1,"Player has a supplied silent frame.");
           last_seqno_read =
               (SUCCESSOR(last_seqno_read) & 0xffff); // manage the packet out of sequence minder
-          if (inbuf == NULL)
-            debug(1, "NULL inbuf to play -- skipping it.");
-          else {
-            if (inbuflength == 0)
-              debug(1, "empty frame to play -- skipping it (1).");
-            else
-              config.output->play(inbuf, inbuflength);
-          }
+          config.output->play(silence, max_frames_per_packet * output_sample_ratio);
         } else {
 
           int enable_dither = 0;