diff options
| -rw-r--r-- | INSTALL | 3 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | src/input_mms.c | 120 | ||||
| -rw-r--r-- | src/input_mms.h | 24 | ||||
| -rw-r--r-- | src/input_stream.c | 7 | ||||
| -rw-r--r-- | src/ls.c | 6 |
8 files changed, 186 insertions, 0 deletions
@@ -108,6 +108,9 @@ For advanced samplerate conversions. libcurl - http://curl.haxx.se/ For playing HTTP streams. +libmms - https://launchpad.net/libmms +For playing MMS streams. + pkg-config ---------- @@ -1,6 +1,7 @@ ver 0.15 - (200?/??/??) * input: - parse Icy-Metadata + - added support for the MMS protocol * tags: - support the "album artist" tag - support MusicBrainz tags diff --git a/configure.ac b/configure.ac index ff4c1457..0461b839 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,18 @@ if test x$enable_curl = xyes; then fi AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes) +AC_ARG_ENABLE(mms, + AS_HELP_STRING([--enable-mms], + [enable the MMS protocol with libmms (default: disable)]),, + [enable_mms=yes]) + +if test x$enable_mms = xyes; then + PKG_CHECK_MODULES(MMS, [libmms], + AC_DEFINE(ENABLE_MMS, 1, [Define when libmms is used for the MMS protocol]), + AC_MSG_ERROR([libmms not found])) +fi +AM_CONDITIONAL(ENABLE_MMS, test x$enable_mms = xyes) + dnl dnl archive plugins @@ -1318,6 +1330,12 @@ else echo " HTTP streaming (libcurl) ......disabled" fi +if test x$enable_mms != xno; then + echo " MMS streaming (libmms) ........enabled" +else + echo " MMS streaming (libmms) ........disabled" +fi + echo "" echo "##########################################" echo "" diff --git a/src/Makefile.am b/src/Makefile.am index 7cbd3154..de9c99f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ mpd_CFLAGS = $(MPD_CFLAGS) mpd_CPPFLAGS = \ $(SQLITE_CFLAGS) \ $(CURL_CFLAGS) \ + $(MMS_CFLAGS) \ $(AO_CFLAGS) $(ALSA_CFLAGS) \ $(SHOUT_CFLAGS) \ $(OGGVORBIS_CFLAGS) $(VORBISENC_CFLAGS) \ @@ -17,6 +18,7 @@ mpd_CPPFLAGS = \ mpd_LDADD = $(MPD_LIBS) \ $(SQLITE_LIBS) \ $(CURL_LIBS) \ + $(MMS_LIBS) \ $(AO_LIBS) $(ALSA_LIBS) \ $(SHOUT_LIBS) \ $(OGGVORBIS_LIBS) $(VORBISENC_LIBS) $(FLAC_LIBS) \ @@ -64,6 +66,7 @@ mpd_headers = \ input_stream.h \ input_file.h \ input_curl.h \ + input_mms.h \ icy_metadata.h \ client.h \ listen.h \ @@ -314,6 +317,10 @@ if HAVE_CURL mpd_SOURCES += input_curl.c icy_metadata.c endif +if ENABLE_MMS +mpd_SOURCES += input_mms.c +endif + if HAVE_ALSA mpd_SOURCES += output/alsa_plugin.c diff --git a/src/input_mms.c b/src/input_mms.c new file mode 100644 index 00000000..f9b2edea --- /dev/null +++ b/src/input_mms.c @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2003-2009 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "input_mms.h" +#include "input_stream.h" + +#include <glib.h> +#include <libmms/mmsx.h> + +#include <string.h> +#include <errno.h> + +struct input_mms { + mmsx_t *mms; + + bool eof; +}; + +static bool +input_mms_open(struct input_stream *is, const char *url) +{ + 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 false; + + m = g_new(struct input_mms, 1); + m->mms = mmsx_connect(NULL, NULL, url, 128 * 1024); + if (m->mms == NULL) { + g_warning("mmsx_connect() failed"); + return false; + } + + /* XX is this correct? at least this selects the ffmpeg + decoder, which seems to work fine*/ + is->mime = g_strdup("audio/x-ms-wma"); + + is->data = m; + is->ready = true; + return true; +} + +static size_t +input_mms_read(struct input_stream *is, void *ptr, size_t size) +{ + struct input_mms *m = is->data; + int ret; + + ret = mmsx_read(NULL, m->mms, ptr, size); + if (ret <= 0) { + if (ret < 0) { + is->error = errno; + g_warning("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 = is->data; + + mmsx_close(m->mms); + g_free(m); +} + +static bool +input_mms_eof(struct input_stream *is) +{ + struct input_mms *m = is->data; + + return m->eof; +} + +static int +input_mms_buffer(G_GNUC_UNUSED struct input_stream *is) +{ + return 0; +} + +static bool +input_mms_seek(G_GNUC_UNUSED struct input_stream *is, + G_GNUC_UNUSED off_t offset, G_GNUC_UNUSED int whence) +{ + return false; +} + +const struct input_plugin input_plugin_mms = { + .open = input_mms_open, + .close = input_mms_close, + .buffer = input_mms_buffer, + .read = input_mms_read, + .eof = input_mms_eof, + .seek = input_mms_seek, +}; diff --git a/src/input_mms.h b/src/input_mms.h new file mode 100644 index 00000000..db98ee39 --- /dev/null +++ b/src/input_mms.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2003-2009 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef INPUT_MMS_H +#define INPUT_MMS_H + +extern const struct input_plugin input_plugin_mms; + +#endif diff --git a/src/input_stream.c b/src/input_stream.c index f69debbf..234511e7 100644 --- a/src/input_stream.c +++ b/src/input_stream.c @@ -29,6 +29,10 @@ #include "input_curl.h" #endif +#ifdef ENABLE_MMS +#include "input_mms.h" +#endif + #include <glib.h> #include <assert.h> @@ -40,6 +44,9 @@ static const struct input_plugin *const input_plugins[] = { #ifdef HAVE_CURL &input_plugin_curl, #endif +#ifdef ENABLE_MMS + &input_plugin_mms, +#endif }; static const unsigned num_input_plugins = @@ -27,6 +27,12 @@ static const char *remoteUrlPrefixes[] = { #ifdef HAVE_CURL "http://", #endif +#ifdef ENABLE_MMS + "mms://", + "mmsh://", + "mmst://", + "mmsu://", +#endif NULL }; |