From e205b25d65ccb380fa158711e24d55b6de5d9bc1 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 16 Feb 2006 19:19:58 +0000
Subject: Reorganised the source tree. We now have src/ with a couple of
 subdirs:

 * daemon/ - Contains the files specific to the polypaudio daemon.
 * modules/ - All loadable modules.
 * polyp/ - Files that are part of the public, application interface or
   are only used in libpolyp.
 * polypcore/ - All other shared files.
 * tests/ - Test programs.
 * utils/ - Utility programs.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@487 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 polyp/client-conf-x11.c | 91 -------------------------------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 polyp/client-conf-x11.c

(limited to 'polyp/client-conf-x11.c')

diff --git a/polyp/client-conf-x11.c b/polyp/client-conf-x11.c
deleted file mode 100644
index 4fd75744..00000000
--- a/polyp/client-conf-x11.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
-
-  polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
-  or (at your option) any later version.
-
-  polypaudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-13071
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <assert.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-
-#include "client-conf-x11.h"
-#include "x11prop.h"
-#include "log.h"
-#include "xmalloc.h"
-#include "util.h"
-
-int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
-    Display *d = NULL;
-    int ret = -1;
-    char t[1024];
-
-    if (!dname && !getenv("DISPLAY"))
-        goto finish;
-    
-    if (!(d = XOpenDisplay(dname))) {
-        pa_log(__FILE__": XOpenDisplay() failed\n");
-        goto finish;
-    }
-
-    if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
-        pa_xfree(c->default_server);
-        c->default_server = pa_xstrdup(t);
-    }
-
-    if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
-        pa_xfree(c->default_sink);
-        c->default_sink = pa_xstrdup(t);
-    }
-
-    if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t))) {
-        pa_xfree(c->default_source);
-        c->default_source = pa_xstrdup(t);
-    }
-
-    if (pa_x11_get_prop(d, "POLYP_COOKIE", t, sizeof(t))) {
-        uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
-
-        if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) {
-            pa_log(__FILE__": failed to parse cookie data\n");
-            goto finish;
-        }
-
-        assert(sizeof(cookie) == sizeof(c->cookie));
-        memcpy(c->cookie, cookie, sizeof(cookie));
-
-        c->cookie_valid = 1;
-
-        pa_xfree(c->cookie_file);
-        c->cookie_file = NULL;
-    }
-
-    ret = 0;
-
-finish:
-    if (d)
-        XCloseDisplay(d);
-
-    return ret;
-    
-}
-- 
cgit