diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-25 17:37:52 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-25 17:37:52 +0100 |
| commit | ad8561bfdc76d05812efc7fa802df48c37fcf770 (patch) | |
| tree | 5b6c4970ac0df54f41ed362159b5b456d1d815bf | |
| parent | 899eb5383d7d0cdd6cd9bc2987d12fa87670fdc5 (diff) | |
| download | mpd-ad8561bfdc76d05812efc7fa802df48c37fcf770.tar.gz mpd-ad8561bfdc76d05812efc7fa802df48c37fcf770.tar.xz mpd-ad8561bfdc76d05812efc7fa802df48c37fcf770.zip | |
mixer: make all mixer_plugin pointers const
The plugin structures must never be modified.
| -rw-r--r-- | src/mixer/alsa_mixer.c | 2 | ||||
| -rw-r--r-- | src/mixer/oss_mixer.c | 2 | ||||
| -rw-r--r-- | src/mixer_api.c | 2 | ||||
| -rw-r--r-- | src/mixer_api.h | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c index aafc8f5d9..36ae76cc9 100644 --- a/src/mixer/alsa_mixer.c +++ b/src/mixer/alsa_mixer.c @@ -237,7 +237,7 @@ alsa_mixer_control(struct mixer_data *data, int cmd, void *arg) return false; } -struct mixer_plugin alsa_mixer = { +const struct mixer_plugin alsa_mixer = { .init = alsa_mixer_init, .finish = alsa_mixer_finish, .configure = alsa_mixer_configure, diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c index ad25099ab..5185a867d 100644 --- a/src/mixer/oss_mixer.c +++ b/src/mixer/oss_mixer.c @@ -218,7 +218,7 @@ oss_mixer_control(struct mixer_data *data, int cmd, void *arg) return false; } -struct mixer_plugin oss_mixer = { +const struct mixer_plugin oss_mixer = { .init = oss_mixer_init, .finish = oss_mixer_finish, .configure = oss_mixer_configure, diff --git a/src/mixer_api.c b/src/mixer_api.c index efeac9f81..bd5e1ca05 100644 --- a/src/mixer_api.c +++ b/src/mixer_api.c @@ -21,7 +21,7 @@ #include "mixer_api.h" -void mixer_init(struct mixer *mixer, struct mixer_plugin *plugin) +void mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin) { assert(plugin != NULL); assert(mixer != NULL); diff --git a/src/mixer_api.h b/src/mixer_api.h index 1f1a2b0b1..c209f4b06 100644 --- a/src/mixer_api.h +++ b/src/mixer_api.h @@ -25,8 +25,8 @@ * list of currently implemented mixers */ -extern struct mixer_plugin alsa_mixer; -extern struct mixer_plugin oss_mixer; +extern const struct mixer_plugin alsa_mixer; +extern const struct mixer_plugin oss_mixer; struct mixer_data; @@ -65,11 +65,11 @@ struct mixer_plugin { }; struct mixer { - struct mixer_plugin *plugin; + const struct mixer_plugin *plugin; struct mixer_data *data; }; -void mixer_init(struct mixer *mixer, struct mixer_plugin *plugin); +void mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin); void mixer_finish(struct mixer *mixer); void mixer_configure(struct mixer *mixer, const struct config_param *param); bool mixer_open(struct mixer *mixer); |