aboutsummaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-15 21:18:55 +0200
committerMax Kellermann <max@duempel.org>2013-10-15 22:49:23 +0200
commit25c208d81d341dd940b5b672af2442c0819e6bb6 (patch)
treeee4928cea75fb72c5a36d83d9a4fc4a73a4d643c /src/input
parent67f87db511a7284fbadf65bbf984480d1eaaeabc (diff)
downloadmpd-25c208d81d341dd940b5b672af2442c0819e6bb6.tar.gz
mpd-25c208d81d341dd940b5b672af2442c0819e6bb6.tar.xz
mpd-25c208d81d341dd940b5b672af2442c0819e6bb6.zip
input/*: don't allocate attribute "mime"
This was a memory leak, because "mime" was a std::string which created another copy and discarded the allocated buffer.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/CdioParanoiaInputPlugin.cxx6
-rw-r--r--src/input/DespotifyInputPlugin.cxx2
-rw-r--r--src/input/FfmpegInputPlugin.cxx2
-rw-r--r--src/input/MmsInputPlugin.cxx2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index 65db12760..e7fc83571 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -240,9 +240,9 @@ input_cdio_open(const char *uri,
i->base.size = (i->lsn_to - i->lsn_from + 1) * CDIO_CD_FRAMESIZE_RAW;
/* hack to make MPD select the "pcm" decoder plugin */
- i->base.mime = g_strdup(reverse_endian
- ? "audio/x-mpd-cdda-pcm-reverse"
- : "audio/x-mpd-cdda-pcm");
+ i->base.mime = reverse_endian
+ ? "audio/x-mpd-cdda-pcm-reverse"
+ : "audio/x-mpd-cdda-pcm";
return &i->base;
}
diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/DespotifyInputPlugin.cxx
index b0665e659..27c54160c 100644
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@@ -60,7 +60,7 @@ struct DespotifyInputStream {
memset(&pcm, 0, sizeof(pcm));
/* Despotify outputs pcm data */
- base.mime = g_strdup("audio/x-mpd-cdda-pcm");
+ base.mime = "audio/x-mpd-cdda-pcm";
base.ready = true;
}
diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx
index f8b948c43..60562062d 100644
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@@ -53,7 +53,7 @@ struct FfmpegInputStream {
- since avio.h doesn't tell us the MIME type of the
resource, we can't select a decoder plugin, but the
"ffmpeg" plugin is quite good at auto-detection */
- base.mime = g_strdup("audio/x-mpd-ffmpeg");
+ base.mime = "audio/x-mpd-ffmpeg";
}
~FfmpegInputStream() {
diff --git a/src/input/MmsInputPlugin.cxx b/src/input/MmsInputPlugin.cxx
index 15c6ac377..069857fba 100644
--- a/src/input/MmsInputPlugin.cxx
+++ b/src/input/MmsInputPlugin.cxx
@@ -45,7 +45,7 @@ struct MmsInputStream {
mms(_mms), eof(false) {
/* XX is this correct? at least this selects the ffmpeg
decoder, which seems to work fine*/
- base.mime = g_strdup("audio/x-ms-wma");
+ base.mime = "audio/x-ms-wma";
base.ready = true;
}