* todo update

* lirc warning fix
* c++ compat


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@336 fefdeb5f-60dc-0310-8127-8f9354f1896f

5 files changed, 22 insertions, 16 deletions

diff --git a/polyp/module-lirc.c b/polyp/module-lirc.c
index 485f570c..b400be12 100644
--- a/polyp/module-lirc.c
+++ b/polyp/module-lirc.c
@@ -171,7 +171,7 @@ int pa__init(struct pa_core *c, struct pa_module*m) {
     u->lirc_fd = -1;
     u->mute_toggle_save = 0;
 
-    if ((u->lirc_fd = lirc_init(pa_modargs_get_value(ma, "appname", "polypaudio"), 1)) < 0) {
+    if ((u->lirc_fd = lirc_init((char*) pa_modargs_get_value(ma, "appname", "polypaudio"), 1)) < 0) {
         pa_log(__FILE__": lirc_init() failed.\n");
         goto fail;
     }
diff --git a/polyp/pactl.c b/polyp/pactl.c
index d4dc6ad1..423cce95 100644
--- a/polyp/pactl.c
+++ b/polyp/pactl.c
@@ -181,7 +181,7 @@ static void get_sink_info_callback(struct pa_context *c, const struct pa_sink_in
            "Latency: %0.0f usec\n",
            i->index,
            i->name,
-           pa_typeid_to_string(i->typeid, tid, sizeof(tid)),
+           pa_typeid_to_string(i->_typeid, tid, sizeof(tid)),
            i->description,
            s,
            i->owner_module,
@@ -224,7 +224,7 @@ static void get_source_info_callback(struct pa_context *c, const struct pa_sourc
            "Monitor of Sink: %s\n"
            "Latency: %0.0f usec\n",
            i->index,
-           pa_typeid_to_string(i->typeid, tid, sizeof(tid)),
+           pa_typeid_to_string(i->_typeid, tid, sizeof(tid)),
            i->name,
            i->description,
            s,
@@ -296,7 +296,7 @@ static void get_client_info_callback(struct pa_context *c, const struct pa_clien
            "Owner Module: %s\n",
            i->index,
            i->name,
-           pa_typeid_to_string(i->typeid, tid, sizeof(tid)),
+           pa_typeid_to_string(i->_typeid, tid, sizeof(tid)),
            i->owner_module != PA_INVALID_INDEX ? t : "n/a");
 }
 
@@ -337,7 +337,7 @@ static void get_sink_input_info_callback(struct pa_context *c, const struct pa_s
            "Resample method: %s\n",
            i->index,
            i->name,
-           pa_typeid_to_string(i->typeid, tid, sizeof(tid)),
+           pa_typeid_to_string(i->_typeid, tid, sizeof(tid)),
            i->owner_module != PA_INVALID_INDEX ? t : "n/a",
            i->client != PA_INVALID_INDEX ? k : "n/a",
            i->sink,
@@ -385,7 +385,7 @@ static void get_source_output_info_callback(struct pa_context *c, const struct p
            "Resample method: %s\n",
            i->index,
            i->name,
-           pa_typeid_to_string(i->typeid, tid, sizeof(tid)),
+           pa_typeid_to_string(i->_typeid, tid, sizeof(tid)),
            i->owner_module != PA_INVALID_INDEX ? t : "n/a",
            i->client != PA_INVALID_INDEX ? k : "n/a",
            i->source,
diff --git a/polyp/polyplib-introspect.c b/polyp/polyplib-introspect.c
index 166555c0..5d6d64ab 100644
--- a/polyp/polyplib-introspect.c
+++ b/polyp/polyplib-introspect.c
@@ -132,7 +132,7 @@ static void context_get_sink_info_callback(struct pa_pdispatch *pd, uint32_t com
                 pa_tagstruct_getu32(t, &i.monitor_source) < 0 ||
                 pa_tagstruct_gets(t, &i.monitor_source_name) < 0 ||
                 pa_tagstruct_get_usec(t, &i.latency) < 0 ||
-                pa_tagstruct_getu32(t, &i.typeid) < 0) {
+                pa_tagstruct_getu32(t, &i._typeid) < 0) {
                 
                 pa_context_fail(o->context, PA_ERROR_PROTOCOL);
                 goto finish;
@@ -226,7 +226,7 @@ static void context_get_source_info_callback(struct pa_pdispatch *pd, uint32_t c
                 pa_tagstruct_getu32(t, &i.monitor_of_sink) < 0 ||
                 pa_tagstruct_gets(t, &i.monitor_of_sink_name) < 0 ||
                 pa_tagstruct_get_usec(t, &i.latency) < 0 ||
-                pa_tagstruct_getu32(t, &i.typeid) < 0) {
+                pa_tagstruct_getu32(t, &i._typeid) < 0) {
                 
                 pa_context_fail(o->context, PA_ERROR_PROTOCOL);
                 goto finish;
@@ -315,7 +315,7 @@ static void context_get_client_info_callback(struct pa_pdispatch *pd, uint32_t c
             if (pa_tagstruct_getu32(t, &i.index) < 0 ||
                 pa_tagstruct_gets(t, &i.name) < 0 ||
                 pa_tagstruct_getu32(t, &i.owner_module) < 0 ||
-                pa_tagstruct_getu32(t, &i.typeid) < 0 ) {
+                pa_tagstruct_getu32(t, &i._typeid) < 0 ) {
                 pa_context_fail(o->context, PA_ERROR_PROTOCOL);
                 goto finish;
             }
@@ -455,7 +455,7 @@ static void context_get_sink_input_info_callback(struct pa_pdispatch *pd, uint32
                 pa_tagstruct_get_usec(t, &i.buffer_usec) < 0 ||
                 pa_tagstruct_get_usec(t, &i.sink_usec) < 0 ||
                 pa_tagstruct_gets(t, &i.resample_method) < 0 ||
-                pa_tagstruct_getu32(t, &i.typeid) < 0) {
+                pa_tagstruct_getu32(t, &i._typeid) < 0) {
                 
                 pa_context_fail(o->context, PA_ERROR_PROTOCOL);
                 goto finish;
@@ -528,7 +528,7 @@ static void context_get_source_output_info_callback(struct pa_pdispatch *pd, uin
                 pa_tagstruct_get_usec(t, &i.buffer_usec) < 0 ||
                 pa_tagstruct_get_usec(t, &i.source_usec) < 0 ||
                 pa_tagstruct_gets(t, &i.resample_method) < 0 ||
-                pa_tagstruct_getu32(t, &i.typeid) < 0) {
+                pa_tagstruct_getu32(t, &i._typeid) < 0) {
                 
                 pa_context_fail(o->context, PA_ERROR_PROTOCOL);
                 goto finish;
diff --git a/polyp/polyplib-introspect.h b/polyp/polyplib-introspect.h
index ba9bde3c..83cdba16 100644
--- a/polyp/polyplib-introspect.h
+++ b/polyp/polyplib-introspect.h
@@ -58,7 +58,7 @@ struct pa_sink_info {
     uint32_t monitor_source;           /**< Index of the monitor source connected to this sink */
     const char *monitor_source_name;   /**< The name of the monitor source */
     pa_usec_t latency;                 /**< Length of filled playback buffer of this sink */
-    pa_typeid_t typeid;                /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a sink by its name */
@@ -80,7 +80,7 @@ struct pa_source_info {
     uint32_t monitor_of_sink;           /**< If this is a monitor source the index of the owning sink, otherwise PA_INVALID_INDEX */
     const char *monitor_of_sink_name;   /**< Name of the owning sink, or PA_INVALID_INDEX */
     pa_usec_t latency;                  /**< Length of filled record buffer of this source. \since 0.5 */
-    pa_typeid_t typeid;                /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a source by its name */
@@ -127,7 +127,7 @@ struct pa_client_info {
     uint32_t index;                      /**< Index of this client */
     const char *name;                    /**< Name of this client */
     uint32_t owner_module;               /**< Index of the owning module, or PA_INVALID_INDEX */
-    pa_typeid_t typeid;                  /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                  /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a client by its index */
@@ -148,7 +148,7 @@ struct pa_sink_input_info {
     pa_usec_t buffer_usec;               /**< Latency due to buffering in sink input, see pa_latency_info for details */
     pa_usec_t sink_usec;                 /**< Latency of the sink device, see pa_latency_info for details */
     const char *resample_method;         /**< Thre resampling method used by this sink input. \since 0.7 */
-    pa_typeid_t typeid;                  /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                 /**< Implementation type. \since 0.8 */
 };
 
 /** Get some information about a sink input by its index */
@@ -168,7 +168,7 @@ struct pa_source_output_info {
     pa_usec_t buffer_usec;               /**< Latency due to buffering in the source output, see pa_latency_info for details. \since 0.5 */
     pa_usec_t source_usec;               /**< Latency of the source device, see pa_latency_info for details. \since 0.5 */
     const char *resample_method;         /**< Thre resampling method used by this source output. \since 0.7 */
-    pa_typeid_t typeid;                  /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                  /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a source output by its index */
diff --git a/polyp/typeid.h b/polyp/typeid.h
index bd10b2e4..cc1676bc 100644
--- a/polyp/typeid.h
+++ b/polyp/typeid.h
@@ -25,6 +25,10 @@
 #include <inttypes.h>
 #include <sys/types.h>
 
+#include <polyp/cdecl.h>
+
+PA_C_DECL_BEGIN
+
 typedef uint32_t pa_typeid_t;
 
 #define PA_TYPEID_UNKNOWN ((pa_typeid_t) -1)
@@ -37,4 +41,6 @@ char *pa_typeid_to_string(pa_typeid_t id, char *ret_s, size_t length);
     (((pa_typeid_t) c & 0xFF) << 8) | \
     (((pa_typeid_t) d & 0xFF)))
 
+PA_C_DECL_END
+
 #endif