From a76097210f3484e77c6826e6b4fb1d50deef3af0 Mon Sep 17 00:00:00 2001
From: Viliam Mateicka <viliam.mateicka@gmail.com>
Date: Thu, 3 Dec 2009 20:43:13 +0100
Subject: encoders: remove unnessesary pointers to const strings

---
 src/encoder/flac_encoder.c    | 4 +---
 src/encoder/lame_encoder.c    | 4 +---
 src/encoder/twolame_encoder.c | 4 +---
 src/encoder/vorbis_encoder.c  | 4 +---
 src/encoder/wave_encoder.c    | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/encoder')

diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c
index 77531678..00b59761 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 03d3756b..279a676d 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 fe1598c9..5081db9f 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 df998efb..8e118e90 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 535dfa14..3f6e2184 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 = {
-- 
cgit v1.2.3