aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-12 16:39:53 +0200
committerMax Kellermann <max@duempel.org>2008-09-12 16:39:53 +0200
commitebd194998aa6f140a0889a9d51fb356f76639361 (patch)
treee6fa2a3ee1a459e5202f3b660485d786f61b9a57
parentd9f170b5dbad075a4cc3651054bd1751c3f66fbc (diff)
downloadmpd-ebd194998aa6f140a0889a9d51fb356f76639361.tar.gz
mpd-ebd194998aa6f140a0889a9d51fb356f76639361.tar.xz
mpd-ebd194998aa6f140a0889a9d51fb356f76639361.zip
shout: constant plugin declarations
Declare both shout plugins "const", since they will never change, once initialized at compile time.
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_shout.c4
-rw-r--r--src/audioOutputs/audioOutput_shout.h6
-rw-r--r--src/audioOutputs/audioOutput_shout_mp3.c2
-rw-r--r--src/audioOutputs/audioOutput_shout_ogg.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 3771ccdc4..f6f15ba49 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -29,13 +29,13 @@
static int shout_init_count;
-static struct shout_encoder_plugin *const shout_encoder_plugins[] = {
+static const struct shout_encoder_plugin *const shout_encoder_plugins[] = {
&shout_mp3_encoder,
&shout_ogg_encoder,
NULL
};
-static struct shout_encoder_plugin *
+static const struct shout_encoder_plugin *
shout_encoder_plugin_get(const char *name)
{
unsigned i;
diff --git a/src/audioOutputs/audioOutput_shout.h b/src/audioOutputs/audioOutput_shout.h
index 6657e3c70..b3ad00139 100644
--- a/src/audioOutputs/audioOutput_shout.h
+++ b/src/audioOutputs/audioOutput_shout.h
@@ -64,7 +64,7 @@ struct shout_data {
shout_metadata_t *shout_meta;
int shout_error;
- struct shout_encoder_plugin *encoder;
+ const struct shout_encoder_plugin *encoder;
void *encoder_data;
float quality;
@@ -87,8 +87,8 @@ struct shout_data {
struct shout_buffer buf;
};
-extern struct shout_encoder_plugin shout_mp3_encoder;
-extern struct shout_encoder_plugin shout_ogg_encoder;
+extern const struct shout_encoder_plugin shout_mp3_encoder;
+extern const struct shout_encoder_plugin shout_ogg_encoder;
#endif
diff --git a/src/audioOutputs/audioOutput_shout_mp3.c b/src/audioOutputs/audioOutput_shout_mp3.c
index 4bdccfd2d..8e2bb565f 100644
--- a/src/audioOutputs/audioOutput_shout_mp3.c
+++ b/src/audioOutputs/audioOutput_shout_mp3.c
@@ -174,7 +174,7 @@ static int shout_mp3_encoder_encode(struct shout_data *sd,
return 0;
}
-struct shout_encoder_plugin shout_mp3_encoder = {
+const struct shout_encoder_plugin shout_mp3_encoder = {
"mp3",
SHOUT_FORMAT_MP3,
diff --git a/src/audioOutputs/audioOutput_shout_ogg.c b/src/audioOutputs/audioOutput_shout_ogg.c
index 327c90b24..746341a75 100644
--- a/src/audioOutputs/audioOutput_shout_ogg.c
+++ b/src/audioOutputs/audioOutput_shout_ogg.c
@@ -289,7 +289,7 @@ static int shout_ogg_encoder_encode(struct shout_data *sd,
return 0;
}
-struct shout_encoder_plugin shout_ogg_encoder = {
+const struct shout_encoder_plugin shout_ogg_encoder = {
"ogg",
SHOUT_FORMAT_VORBIS,