client-conf: Remove redundant function parameters

[pulseaudio] / src / pulse / client-conf.h

diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index 9d45af4785aac277b6f1c39d0f92d9c72f712495..c6c74cadeed93d13f2c1510f5e27780cb0c4b460 100644 (file)
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -1,14 +1,14 @@
 #ifndef fooclientconfhfoo
 #define fooclientconfhfoo
 
 #ifndef fooclientconfhfoo
 #define fooclientconfhfoo
 

-/* $Id$ */
-

 /***
   This file is part of PulseAudio.
 
 /***
   This file is part of PulseAudio.
 

+  Copyright 2004-2006 Lennart Poettering
+

   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   PulseAudio 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,
+  by the Free Software Foundation; either version 2.1 of the License,

   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but
   or (at your option) any later version.
 
   PulseAudio is distributed in the hope that it will be useful, but


@@ -22,31 +22,38 @@
   USA.
 ***/
 
   USA.
 ***/
 

+#include <pulsecore/macro.h>

 #include <pulsecore/native-common.h>
 
 #include <pulsecore/native-common.h>
 

-/* A structure containing configuration data for pulseaudio clients. */
+/* A structure containing configuration data for PulseAudio clients. */

 
 typedef struct pa_client_conf {
 
 typedef struct pa_client_conf {

-    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
-    int autospawn;
+    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *default_dbus_server, *cookie_file;
+    bool autospawn, disable_shm, auto_connect_localhost, auto_connect_display;

     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];

-    int cookie_valid; /* non-zero, when cookie is valid */
+    bool cookie_valid; /* non-zero, when cookie is valid */
+    size_t shm_size;

 } pa_client_conf;
 
 /* Create a new configuration data object and reset it to defaults */
 pa_client_conf *pa_client_conf_new(void);
 void pa_client_conf_free(pa_client_conf *c);
 
 } pa_client_conf;
 
 /* Create a new configuration data object and reset it to defaults */
 pa_client_conf *pa_client_conf_new(void);
 void pa_client_conf_free(pa_client_conf *c);
 

-/* Load the configuration data from the speicified file, overwriting
- * the current settings in *c. When the filename is NULL, the
- * default client configuration file name is used. */
-int pa_client_conf_load(pa_client_conf *c, const char *filename);
+/* Load the configuration data from the client configuration file, overwriting
+ * the current settings in *c. */
+int pa_client_conf_load(pa_client_conf *c);

 
 /* Load the configuration data from the environment of the current
    process, overwriting the current settings in *c. */
 int pa_client_conf_env(pa_client_conf *c);
 
 
 /* Load the configuration data from the environment of the current
    process, overwriting the current settings in *c. */
 int pa_client_conf_env(pa_client_conf *c);
 

-/* Load cookie data from c->cookie_file into c->cookie */
-int pa_client_conf_load_cookie(pa_client_conf* c);
+/* Load cookie data from cookie_file_path into c->cookie */
+int pa_client_conf_load_cookie_from_file(pa_client_conf *c, const char *cookie_file_path);
+
+/* Load cookie data from hexdecimal string into c->cookie */
+int pa_client_conf_load_cookie_from_hex(pa_client_conf *c, const char *cookie_in_hex);
+
+/* Set cookie direct from memory */
+int pa_client_conf_set_cookie(pa_client_conf *c, uint8_t *cookie, size_t cookie_size);

 
 #endif
 
 #endif