aboutsummaryrefslogtreecommitdiffstats
path: root/src/MixerControl.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-04-16 21:33:25 +0200
committerMax Kellermann <max@duempel.org>2013-04-16 21:33:25 +0200
commitcb8449a66dfa7503951d3c9a27a957918849ac57 (patch)
tree33d1af378739fb46d12569b03022697226f5b40f /src/MixerControl.cxx
parent621467717d93221a63c9234d4273d9629635c30f (diff)
downloadmpd-cb8449a66dfa7503951d3c9a27a957918849ac57.tar.gz
mpd-cb8449a66dfa7503951d3c9a27a957918849ac57.tar.xz
mpd-cb8449a66dfa7503951d3c9a27a957918849ac57.zip
MixerInternal: convert to class
Diffstat (limited to '')
-rw-r--r--src/MixerControl.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/MixerControl.cxx b/src/MixerControl.cxx
index 4ca1c76ec..7bba4d46b 100644
--- a/src/MixerControl.cxx
+++ b/src/MixerControl.cxx
@@ -27,24 +27,24 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mixer"
-struct mixer *
+Mixer *
mixer_new(const struct mixer_plugin *plugin, void *ao,
const struct config_param *param,
GError **error_r)
{
- struct mixer *mixer;
+ Mixer *mixer;
assert(plugin != NULL);
mixer = plugin->init(ao, param, error_r);
- assert(mixer == NULL || mixer->plugin == plugin);
+ assert(mixer == NULL || mixer->IsPlugin(*plugin));
return mixer;
}
void
-mixer_free(struct mixer *mixer)
+mixer_free(Mixer *mixer)
{
assert(mixer != NULL);
assert(mixer->plugin != NULL);
@@ -60,7 +60,7 @@ mixer_free(struct mixer *mixer)
}
bool
-mixer_open(struct mixer *mixer, GError **error_r)
+mixer_open(Mixer *mixer, GError **error_r)
{
bool success;
@@ -84,7 +84,7 @@ mixer_open(struct mixer *mixer, GError **error_r)
}
static void
-mixer_close_internal(struct mixer *mixer)
+mixer_close_internal(Mixer *mixer)
{
assert(mixer != NULL);
assert(mixer->plugin != NULL);
@@ -97,7 +97,7 @@ mixer_close_internal(struct mixer *mixer)
}
void
-mixer_close(struct mixer *mixer)
+mixer_close(Mixer *mixer)
{
assert(mixer != NULL);
assert(mixer->plugin != NULL);
@@ -111,7 +111,7 @@ mixer_close(struct mixer *mixer)
}
void
-mixer_auto_close(struct mixer *mixer)
+mixer_auto_close(Mixer *mixer)
{
if (!mixer->plugin->global)
mixer_close(mixer);
@@ -122,7 +122,7 @@ mixer_auto_close(struct mixer *mixer)
* calling this function.
*/
static void
-mixer_failed(struct mixer *mixer)
+mixer_failed(Mixer *mixer)
{
assert(mixer->open);
@@ -132,7 +132,7 @@ mixer_failed(struct mixer *mixer)
}
int
-mixer_get_volume(struct mixer *mixer, GError **error_r)
+mixer_get_volume(Mixer *mixer, GError **error_r)
{
int volume;
@@ -161,7 +161,7 @@ mixer_get_volume(struct mixer *mixer, GError **error_r)
}
bool
-mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r)
+mixer_set_volume(Mixer *mixer, unsigned volume, GError **error_r)
{
bool success;