aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViliam Mateicka <viliam.mateicka@gmail.com>2009-12-03 20:43:13 +0100
committerViliam Mateicka <viliam.mateicka@gmail.com>2009-12-03 20:43:13 +0100
commita76097210f3484e77c6826e6b4fb1d50deef3af0 (patch)
tree7b188cb3a5d452a36bf99b78db15c42594d93136
parentac0bf1a445ab0d76b5d3c76b115552cfe4475ae0 (diff)
downloadmpd-a76097210f3484e77c6826e6b4fb1d50deef3af0.tar.gz
mpd-a76097210f3484e77c6826e6b4fb1d50deef3af0.tar.xz
mpd-a76097210f3484e77c6826e6b4fb1d50deef3af0.zip
encoders: remove unnessesary pointers to const strings
-rw-r--r--src/encoder/flac_encoder.c4
-rw-r--r--src/encoder/lame_encoder.c4
-rw-r--r--src/encoder/twolame_encoder.c4
-rw-r--r--src/encoder/vorbis_encoder.c4
-rw-r--r--src/encoder/wave_encoder.c4
5 files changed, 5 insertions, 15 deletions
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index 775316789..00b59761b 100644
--- a/src/encoder/flac_encoder.c
+++ b/src/encoder/flac_encoder.c
@@ -332,12 +332,10 @@ flac_encoder_read(struct encoder *_encoder, void *dest, size_t length)
return length;
}
-static const char *flac_encoder_mime_type = "audio/flac";
-
static const char *
flac_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder)
{
- return flac_encoder_mime_type;
+ return "audio/flac";
}
const struct encoder_plugin flac_encoder_plugin = {
diff --git a/src/encoder/lame_encoder.c b/src/encoder/lame_encoder.c
index 03d3756b6..279a676d9 100644
--- a/src/encoder/lame_encoder.c
+++ b/src/encoder/lame_encoder.c
@@ -275,12 +275,10 @@ lame_encoder_read(struct encoder *_encoder, void *dest, size_t length)
return length;
}
-static const char *lame_encoder_mime_type = "audio/mpeg";
-
static const char *
lame_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder)
{
- return lame_encoder_mime_type;
+ return "audio/mpeg";
}
const struct encoder_plugin lame_encoder_plugin = {
diff --git a/src/encoder/twolame_encoder.c b/src/encoder/twolame_encoder.c
index fe1598c90..5081db9fb 100644
--- a/src/encoder/twolame_encoder.c
+++ b/src/encoder/twolame_encoder.c
@@ -288,12 +288,10 @@ twolame_encoder_read(struct encoder *_encoder, void *dest, size_t length)
return length;
}
-static const char *twolame_encoder_mime_type = "audio/mpeg";
-
static const char *
twolame_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder)
{
- return twolame_encoder_mime_type;
+ return "audio/mpeg";
}
const struct encoder_plugin twolame_encoder_plugin = {
diff --git a/src/encoder/vorbis_encoder.c b/src/encoder/vorbis_encoder.c
index df998efb2..8e118e90a 100644
--- a/src/encoder/vorbis_encoder.c
+++ b/src/encoder/vorbis_encoder.c
@@ -382,12 +382,10 @@ vorbis_encoder_read(struct encoder *_encoder, void *_dest, size_t length)
return nbytes;
}
-static const char *vorbis_encoder_mime_type = "application/x-ogg";
-
static const char *
vorbis_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder)
{
- return vorbis_encoder_mime_type;
+ return "application/x-ogg";
}
const struct encoder_plugin vorbis_encoder_plugin = {
diff --git a/src/encoder/wave_encoder.c b/src/encoder/wave_encoder.c
index 535dfa145..3f6e21845 100644
--- a/src/encoder/wave_encoder.c
+++ b/src/encoder/wave_encoder.c
@@ -253,12 +253,10 @@ wave_encoder_read(struct encoder *_encoder, void *dest, size_t length)
return length;
}
-static const char *wave_encoder_mime_type = "audio/wav";
-
static const char *
wave_encoder_get_mime_type(G_GNUC_UNUSED struct encoder *_encoder)
{
- return wave_encoder_mime_type;
+ return "audio/wav";
}
const struct encoder_plugin wave_encoder_plugin = {