Remove client_name libao option, it might cause problems

[deb_shairplay.git] / src / shairplay.c

diff --git a/src/shairplay.c b/src/shairplay.c
index bf269efbe76acbf65e421dc9cb4b6e0b350e3a69..82f1183d0f231bfb42aff498c39eb0e4987d00bf 100644 (file)
--- a/src/shairplay.c
+++ b/src/shairplay.c
@@ -106,7 +106,6 @@ audio_open_device(shairplay_options_t *opt, int bits, int channels, int samplera
        }
 
        /* Add all available libao options */
-       ao_append_option(&ao_options, "client_name", opt->apname);
        if (strlen(opt->ao_devicename)) {
                ao_append_option(&ao_options, "dev", opt->ao_devicename);
        }
@@ -226,7 +225,8 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
        char *path = argv[0];
        char *arg;
 
-       strcpy(opt->apname, "Shairplay");
+       /* Set default values for apname and port */
+       strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
        opt->port = 5000;
 
        while ((arg = *++argv)) {
@@ -264,13 +264,6 @@ parse_options(shairplay_options_t *opt, int argc, char *argv[])
                }
        }
 
-       /* Set default values for apname and port */
-       if (!strlen(opt->apname)) {
-               strncpy(opt->apname, "Shairplay", sizeof(opt->apname)-1);
-       }
-       if (!opt->port) {
-               opt->port = 5000;
-       }
        return 0;
 }