aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-04-21 13:22:45 +0200
committerAnton Khirnov <anton@khirnov.net>2013-11-04 10:52:50 +0100
commitd3018bfbb5f5712e6fe0f7ce534a362a0518d2c2 (patch)
treed5b26459ae7fe2b4e3efdf079c303abc3fb2d91f
parent6f83de5c69478ce661a33c9270c687754da31ea4 (diff)
Drop mms protocol.
-rw-r--r--src/input/mms_input_plugin.c140
-rw-r--r--src/input/mms_input_plugin.h25
-rw-r--r--src/input_registry.c7
-rw-r--r--src/ls.c6
4 files changed, 0 insertions, 178 deletions
diff --git a/src/input/mms_input_plugin.c b/src/input/mms_input_plugin.c
deleted file mode 100644
index cff15125..00000000
--- a/src/input/mms_input_plugin.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "input/mms_input_plugin.h"
-#include "input_internal.h"
-#include "input_plugin.h"
-
-#include <glib.h>
-#include <libmms/mmsx.h>
-
-#include <string.h>
-#include <errno.h>
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "input_mms"
-
-struct input_mms {
- struct input_stream base;
-
- mmsx_t *mms;
-
- bool eof;
-};
-
-static inline GQuark
-mms_quark(void)
-{
- return g_quark_from_static_string("mms");
-}
-
-static struct input_stream *
-input_mms_open(const char *url,
- GMutex *mutex, GCond *cond,
- GError **error_r)
-{
- struct input_mms *m;
-
- if (!g_str_has_prefix(url, "mms://") &&
- !g_str_has_prefix(url, "mmsh://") &&
- !g_str_has_prefix(url, "mmst://") &&
- !g_str_has_prefix(url, "mmsu://"))
- return NULL;
-
- m = g_new(struct input_mms, 1);
- input_stream_init(&m->base, &input_plugin_mms, url,
- mutex, cond);
-
- m->mms = mmsx_connect(NULL, NULL, url, 128 * 1024);
- if (m->mms == NULL) {
- g_free(m);
- g_set_error(error_r, mms_quark(), 0, "mmsx_connect() failed");
- return NULL;
- }
-
- m->eof = false;
-
- /* XX is this correct? at least this selects the ffmpeg
- decoder, which seems to work fine*/
- m->base.mime = g_strdup("audio/x-ms-wma");
-
- m->base.ready = true;
-
- return &m->base;
-}
-
-static size_t
-input_mms_read(struct input_stream *is, void *ptr, size_t size,
- GError **error_r)
-{
- struct input_mms *m = (struct input_mms *)is;
- int ret;
-
- ret = mmsx_read(NULL, m->mms, ptr, size);
- if (ret <= 0) {
- if (ret < 0) {
- g_set_error(error_r, mms_quark(), errno,
- "mmsx_read() failed: %s",
- g_strerror(errno));
- }
-
- m->eof = true;
- return false;
- }
-
- is->offset += ret;
-
- return (size_t)ret;
-}
-
-static void
-input_mms_close(struct input_stream *is)
-{
- struct input_mms *m = (struct input_mms *)is;
-
- mmsx_close(m->mms);
- input_stream_deinit(&m->base);
- g_free(m);
-}
-
-static bool
-input_mms_eof(struct input_stream *is)
-{
- struct input_mms *m = (struct input_mms *)is;
-
- return m->eof;
-}
-
-static bool
-input_mms_seek(G_GNUC_UNUSED struct input_stream *is,
- G_GNUC_UNUSED goffset offset, G_GNUC_UNUSED int whence,
- G_GNUC_UNUSED GError **error_r)
-{
- return false;
-}
-
-const struct input_plugin input_plugin_mms = {
- .name = "mms",
- .open = input_mms_open,
- .close = input_mms_close,
- .read = input_mms_read,
- .eof = input_mms_eof,
- .seek = input_mms_seek,
-};
diff --git a/src/input/mms_input_plugin.h b/src/input/mms_input_plugin.h
deleted file mode 100644
index d6aa593f..00000000
--- a/src/input/mms_input_plugin.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef INPUT_MMS_H
-#define INPUT_MMS_H
-
-extern const struct input_plugin input_plugin_mms;
-
-#endif
diff --git a/src/input_registry.c b/src/input_registry.c
index 5987d5da..dca49449 100644
--- a/src/input_registry.c
+++ b/src/input_registry.c
@@ -37,10 +37,6 @@
#include "input/ffmpeg_input_plugin.h"
#endif
-#ifdef ENABLE_MMS
-#include "input/mms_input_plugin.h"
-#endif
-
#ifdef ENABLE_CDIO_PARANOIA
#include "input/cdio_paranoia_input_plugin.h"
#endif
@@ -65,9 +61,6 @@ const struct input_plugin *const input_plugins[] = {
#ifdef HAVE_FFMPEG
&input_plugin_ffmpeg,
#endif
-#ifdef ENABLE_MMS
- &input_plugin_mms,
-#endif
#ifdef ENABLE_CDIO_PARANOIA
&input_plugin_cdio_paranoia,
#endif
diff --git a/src/ls.c b/src/ls.c
index 310c2d7b..1c72a2a7 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -35,12 +35,6 @@ static const char *remoteUrlPrefixes[] = {
#if defined(ENABLE_CURL) || defined(ENABLE_SOUP)
"http://",
#endif
-#ifdef ENABLE_MMS
- "mms://",
- "mmsh://",
- "mmst://",
- "mmsu://",
-#endif
#ifdef HAVE_FFMPEG
"gopher://",
"rtp://",