Merge branch 't/oggdec_cleanups'

[paraslash.git] / audioc.c

diff --git a/audioc.c b/audioc.c
index f91f41ffc99e004ff8468000f6579ee045265ff8..8c46b46f7d19864dbbd0c0074d399cb12ea696f2 100644 (file)
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "audioc.cmdline.h"
 #include "para.h"
@@ -16,6 +15,7 @@
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "version.h"
 
 INIT_AUDIOC_ERRLISTS;
 
@@ -95,16 +95,16 @@ int main(int argc, char *argv[])
                para_strdup("stat");
 
        if (conf.socket_given)
-               ret = create_remote_socket(conf.socket_arg);
+               ret = connect_local_socket(conf.socket_arg);
        else {
                char *hn = para_hostname(), *socket_name = make_message(
                        "/var/paraslash/audiod_socket.%s", hn);
-               ret = create_remote_socket(socket_name);
+               ret = connect_local_socket(socket_name);
                free(hn);
                free(socket_name);
        }
        if (ret < 0) {
-               PARA_EMERG_LOG("failed to create remote socket\n");
+               PARA_EMERG_LOG("failed to connect to local socket\n");
                goto out;
        }
        fd = ret;