Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

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

diff --git a/src/pulse/client-conf.h b/src/pulse/client-conf.h
index 78844a126f8d056fdae9680a446c05118a653e8b..618216f4ff5e622f72cf66531997d42c6691a52b 100644 (file)
--- a/src/pulse/client-conf.h
+++ b/src/pulse/client-conf.h
@@ -22,12 +22,13 @@
   USA.
 ***/
 
+#include <pulsecore/macro.h>
 #include <pulsecore/native-common.h>
 
 /* A structure containing configuration data for PulseAudio clients. */
 
 typedef struct pa_client_conf {
-    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *cookie_file;
+    char *daemon_binary, *extra_arguments, *default_sink, *default_source, *default_server, *default_dbus_server, *cookie_file;
     pa_bool_t autospawn, disable_shm;
     uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
     pa_bool_t cookie_valid; /* non-zero, when cookie is valid */
@@ -38,7 +39,7 @@ typedef struct pa_client_conf {
 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
+/* Load the configuration data from the specified 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);