4 files changed, 9 insertions, 9 deletions
diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c
index 201cb6f20..2433d5b9c 100644
--- a/src/mixer/alsa_mixer.c
+++ b/src/mixer/alsa_mixer.c
@@ -44,10 +44,10 @@ alsa_mixer_finish(struct mixer_data *data)
 }
 
 static void
-alsa_mixer_configure(struct mixer_data *data, ConfigParam *param)
+alsa_mixer_configure(struct mixer_data *data, struct config_param *param)
 {
 	struct alsa_mixer *am = (struct alsa_mixer *)data;
-	BlockParam *bp;
+	struct block_param *bp;
 
 	if (param == NULL)
 		return;
@@ -149,7 +149,7 @@ alsa_mixer_control(struct mixer_data *data, int cmd, void *arg)
 	struct alsa_mixer *am = (struct alsa_mixer *)data;
 	switch (cmd) {
 	case AC_MIXER_CONFIGURE:
-		alsa_mixer_configure(data, (ConfigParam *)arg);
+		alsa_mixer_configure(data, (struct config_param *)arg);
 		if (am->handle)
 			alsa_mixer_close(data);
 		return true;
diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c
index 3f4b290d9..a6c7684d2 100644
--- a/src/mixer/oss_mixer.c
+++ b/src/mixer/oss_mixer.c
@@ -48,10 +48,10 @@ oss_mixer_finish(struct mixer_data *data)
 }
 
 static void
-oss_mixer_configure(struct mixer_data *data, ConfigParam *param)
+oss_mixer_configure(struct mixer_data *data, struct config_param *param)
 {
 	struct oss_mixer *om = (struct oss_mixer *) data;
-	BlockParam *bp;
+	struct block_param *bp;
 
 	if (param == NULL)
 		return;
@@ -142,7 +142,7 @@ oss_mixer_control(struct mixer_data *data, int cmd, void *arg)
 	struct oss_mixer *om = (struct oss_mixer *) data;
 	switch (cmd) {
 	case AC_MIXER_CONFIGURE:
-		oss_mixer_configure(data, (ConfigParam *)arg);
+		oss_mixer_configure(data, (struct config_param *)arg);
 		if (om->device_fd >= 0)
 			oss_mixer_close(data);
 		return true;
diff --git a/src/mixer_api.c b/src/mixer_api.c
index f77f764cf..cb493aa0a 100644
--- a/src/mixer_api.c
+++ b/src/mixer_api.c
@@ -20,7 +20,7 @@ void mixer_finish(struct mixer *mixer)
 	mixer->plugin = NULL;
 }
 
-void mixer_configure(struct mixer *mixer, ConfigParam *param)
+void mixer_configure(struct mixer *mixer, struct config_param *param)
 {
 	assert(mixer != NULL && mixer->plugin != NULL);
 	mixer->plugin->configure(mixer->data, param);
diff --git a/src/mixer_api.h b/src/mixer_api.h
index 67d08427c..61f6c06f2 100644
--- a/src/mixer_api.h
+++ b/src/mixer_api.h
@@ -28,7 +28,7 @@ struct mixer_plugin {
         /**
 	 * Setup and configure mixer
          */
-	void (*configure)(struct mixer_data *data, ConfigParam *param);
+	void (*configure)(struct mixer_data *data, struct config_param *param);
 
         /**
     	 * Open mixer device
@@ -53,7 +53,7 @@ struct mixer {
 
 void mixer_init(struct mixer *mixer, struct mixer_plugin *plugin);
 void mixer_finish(struct mixer *mixer);
-void mixer_configure(struct mixer *mixer, ConfigParam *param);
+void mixer_configure(struct mixer *mixer, struct config_param *param);
 bool mixer_open(struct mixer *mixer);
 bool mixer_control(struct mixer *mixer, int cmd, void *arg);
 void mixer_close(struct mixer *mixer);