1 files changed, 18 insertions, 18 deletions

diff --git a/polyp/module-oss.c b/polyp/module-oss.c
index 02acc6f4..7c331893 100644
--- a/polyp/module-oss.c
+++ b/polyp/module-oss.c
@@ -55,18 +55,18 @@ PA_MODULE_USAGE("sink_name=<name for the sink> source_name=<name for the source>
 #define PA_TYPEID_OSS PA_TYPEID_MAKE('O', 'S', 'S', '_')
 
 struct userdata {
-    struct pa_sink *sink;
-    struct pa_source *source;
-    struct pa_iochannel *io;
-    struct pa_core *core;
+    pa_sink *sink;
+    pa_source *source;
+    pa_iochannel *io;
+    pa_core *core;
 
-    struct pa_memchunk memchunk, silence;
+    pa_memchunk memchunk, silence;
 
     uint32_t in_fragment_size, out_fragment_size, sample_size;
     int use_getospace, use_getispace;
 
     int fd;
-    struct pa_module *module;
+    pa_module *module;
 };
 
 static const char* const valid_modargs[] = {
@@ -89,13 +89,13 @@ static const char* const valid_modargs[] = {
 
 static void update_usage(struct userdata *u) {
    pa_module_set_used(u->module,
-                      (u->sink ? pa_idxset_ncontents(u->sink->inputs) : 0) +
-                      (u->sink ? pa_idxset_ncontents(u->sink->monitor_source->outputs) : 0) +
-                      (u->source ? pa_idxset_ncontents(u->source->outputs) : 0));
+                      (u->sink ? pa_idxset_size(u->sink->inputs) : 0) +
+                      (u->sink ? pa_idxset_size(u->sink->monitor_source->outputs) : 0) +
+                      (u->source ? pa_idxset_size(u->source->outputs) : 0));
 }
 
 static void do_write(struct userdata *u) {
-    struct pa_memchunk *memchunk;
+    pa_memchunk *memchunk;
     ssize_t r;
     size_t l;
     int loop = 0;
@@ -155,7 +155,7 @@ static void do_write(struct userdata *u) {
 }
 
 static void do_read(struct userdata *u) {
-    struct pa_memchunk memchunk;
+    pa_memchunk memchunk;
     ssize_t r;
     size_t l;
     int loop = 0;
@@ -202,14 +202,14 @@ static void do_read(struct userdata *u) {
     } while (loop && l > 0);
 }
 
-static void io_callback(struct pa_iochannel *io, void*userdata) {
+static void io_callback(PA_GCC_UNUSED pa_iochannel *io, void*userdata) {
     struct userdata *u = userdata;
     assert(u);
     do_write(u);
     do_read(u);
 }
 
-static pa_usec_t sink_get_latency_cb(struct pa_sink *s) {
+static pa_usec_t sink_get_latency_cb(pa_sink *s) {
     pa_usec_t r = 0;
     int arg;
     struct userdata *u = s->userdata;
@@ -229,7 +229,7 @@ static pa_usec_t sink_get_latency_cb(struct pa_sink *s) {
     return r;
 }
 
-static pa_usec_t source_get_latency_cb(struct pa_source *s) {
+static pa_usec_t source_get_latency_cb(pa_source *s) {
     struct userdata *u = s->userdata;
     audio_buf_info info;
     assert(s && u && u->source);
@@ -248,7 +248,7 @@ static pa_usec_t source_get_latency_cb(struct pa_source *s) {
     return pa_bytes_to_usec(info.bytes, &s->sample_spec);
 }
 
-int pa__init(struct pa_core *c, struct pa_module*m) {
+int pa__init(pa_core *c, pa_module*m) {
     struct audio_buf_info info;
     struct userdata *u = NULL;
     const char *p;
@@ -256,8 +256,8 @@ int pa__init(struct pa_core *c, struct pa_module*m) {
     int nfrags, frag_size, in_frag_size, out_frag_size;
     int mode;
     int record = 1, playback = 1;
-    struct pa_sample_spec ss;
-    struct pa_modargs *ma = NULL;
+    pa_sample_spec ss;
+    pa_modargs *ma = NULL;
     assert(c && m);
 
     if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
@@ -380,7 +380,7 @@ fail:
     return -1;
 }
 
-void pa__done(struct pa_core *c, struct pa_module*m) {
+void pa__done(pa_core *c, pa_module*m) {
     struct userdata *u;
     assert(c && m);