1 files changed, 17 insertions, 17 deletions

diff --git a/src/pulsemixerctrl.c b/src/pulsemixerctrl.c
index 4786004..883331f 100644
--- a/src/pulsemixerctrl.c
+++ b/src/pulsemixerctrl.c
@@ -33,7 +33,7 @@ GST_DEBUG_CATEGORY_EXTERN(pulse_debug);
 #define GST_CAT_DEFAULT pulse_debug
 
 static void gst_pulsemixer_ctrl_context_state_cb(pa_context *context, void *userdata) {
-    GstPolypMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
+    GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
 
     /* Called from the background thread! */
     
@@ -53,7 +53,7 @@ static void gst_pulsemixer_ctrl_context_state_cb(pa_context *context, void *user
 }
 
 static void gst_pulsemixer_ctrl_sink_info_cb(pa_context *context, const pa_sink_info *i, int eol, void *userdata) {
-    GstPolypMixerCtrl *c = (GstPolypMixerCtrl*) userdata;
+    GstPulseMixerCtrl *c = (GstPulseMixerCtrl*) userdata;
 
     /* Called from the background thread! */
 
@@ -85,7 +85,7 @@ static void gst_pulsemixer_ctrl_sink_info_cb(pa_context *context, const pa_sink_
 }
 
 static void gst_pulsemixer_ctrl_source_info_cb(pa_context *context, const pa_source_info *i, int eol, void *userdata) {
-    GstPolypMixerCtrl *c = (GstPolypMixerCtrl*) userdata;
+    GstPulseMixerCtrl *c = (GstPulseMixerCtrl*) userdata;
 
     /* Called from the background thread! */
 
@@ -116,7 +116,7 @@ static void gst_pulsemixer_ctrl_source_info_cb(pa_context *context, const pa_sou
 }
 
 static void gst_pulsemixer_ctrl_subscribe_cb(pa_context *context, pa_subscription_event_type_t t, uint32_t idx, void *userdata) {
-    GstPolypMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
+    GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
     pa_operation *o = NULL;
 
     /* Called from the background thread! */
@@ -141,7 +141,7 @@ static void gst_pulsemixer_ctrl_subscribe_cb(pa_context *context, pa_subscriptio
 }
 
 static void gst_pulsemixer_ctrl_success_cb(pa_context *context, int success, void *userdata) {
-    GstPolypMixerCtrl *c = (GstPolypMixerCtrl*) userdata;
+    GstPulseMixerCtrl *c = (GstPulseMixerCtrl*) userdata;
 
     c->operation_success = success;
     pa_threaded_mainloop_signal(c->mainloop, 0);
@@ -154,7 +154,7 @@ if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \
 } \
 } while(0);
 
-static gboolean gst_pulsemixer_ctrl_open(GstPolypMixerCtrl *c) {
+static gboolean gst_pulsemixer_ctrl_open(GstPulseMixerCtrl *c) {
     int e;
     gchar *name = gst_pulse_client_name();
     pa_operation *o = NULL;
@@ -275,7 +275,7 @@ unlock_and_fail:
     return FALSE;
 }
 
-static void gst_pulsemixer_ctrl_close(GstPolypMixerCtrl *c) {
+static void gst_pulsemixer_ctrl_close(GstPulseMixerCtrl *c) {
     g_assert(c);
 
     if (c->mainloop)
@@ -305,10 +305,10 @@ static void gst_pulsemixer_ctrl_close(GstPolypMixerCtrl *c) {
     }
 }
 
-GstPolypMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *device, GstPolypMixerType type) {
-    GstPolypMixerCtrl *c = NULL;
+GstPulseMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *device, GstPulseMixerType type) {
+    GstPulseMixerCtrl *c = NULL;
 
-    c = g_new(GstPolypMixerCtrl, 1);
+    c = g_new(GstPulseMixerCtrl, 1);
     c->tracklist = NULL;
     c->server = g_strdup(server);
     c->device = g_strdup(device);
@@ -334,7 +334,7 @@ GstPolypMixerCtrl* gst_pulsemixer_ctrl_new(const gchar *server, const gchar *dev
     return c;
 }
 
-void gst_pulsemixer_ctrl_free(GstPolypMixerCtrl *c) {
+void gst_pulsemixer_ctrl_free(GstPulseMixerCtrl *c) {
     g_assert(c);
 
     gst_pulsemixer_ctrl_close(c);
@@ -346,7 +346,7 @@ void gst_pulsemixer_ctrl_free(GstPolypMixerCtrl *c) {
     g_free(c);
 }
 
-const GList* gst_pulsemixer_ctrl_list_tracks(GstPolypMixerCtrl *c) {
+const GList* gst_pulsemixer_ctrl_list_tracks(GstPulseMixerCtrl *c) {
     g_assert(c);
 
     return c->tracklist;
@@ -354,7 +354,7 @@ const GList* gst_pulsemixer_ctrl_list_tracks(GstPolypMixerCtrl *c) {
 
 static void gst_pulsemixer_ctrl_timeout_event(pa_mainloop_api *a, pa_time_event *e, const struct timeval *tv, void *userdata) {
     pa_operation *o;
-    GstPolypMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
+    GstPulseMixerCtrl *c = GST_PULSEMIXER_CTRL(userdata);
     
     if (c->type == GST_PULSEMIXER_SINK)
         o = pa_context_set_sink_volume_by_index(c->context, c->index, &c->volume, NULL, NULL);
@@ -371,7 +371,7 @@ static void gst_pulsemixer_ctrl_timeout_event(pa_mainloop_api *a, pa_time_event
     c->time_event = NULL;
 }
 
-void gst_pulsemixer_ctrl_set_volume(GstPolypMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
+void gst_pulsemixer_ctrl_set_volume(GstPulseMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
     pa_cvolume v;
     int i;
     
@@ -399,7 +399,7 @@ void gst_pulsemixer_ctrl_set_volume(GstPolypMixerCtrl *c, GstMixerTrack *track,
     pa_threaded_mainloop_unlock(c->mainloop);
 }
 
-void gst_pulsemixer_ctrl_get_volume(GstPolypMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
+void gst_pulsemixer_ctrl_get_volume(GstPulseMixerCtrl *c, GstMixerTrack *track, gint *volumes) {
     int i;
     
     g_assert(c);
@@ -413,12 +413,12 @@ void gst_pulsemixer_ctrl_get_volume(GstPolypMixerCtrl *c, GstMixerTrack *track,
     pa_threaded_mainloop_unlock(c->mainloop);
 }
 
-void gst_pulsemixer_ctrl_set_record(GstPolypMixerCtrl *c, GstMixerTrack *track, gboolean record) {
+void gst_pulsemixer_ctrl_set_record(GstPulseMixerCtrl *c, GstMixerTrack *track, gboolean record) {
     g_assert(c);
     g_assert(track == c->track);
 }
 
-void gst_pulsemixer_ctrl_set_mute(GstPolypMixerCtrl *c, GstMixerTrack *track, gboolean mute) {
+void gst_pulsemixer_ctrl_set_mute(GstPulseMixerCtrl *c, GstMixerTrack *track, gboolean mute) {
     pa_operation *o = NULL;
     
     g_assert(c);