changed: remove libmms support

README.linux

@@ -51,7 +51,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
  libavformat-dev, libavutil-dev, libpostproc-dev, libswscale-dev,
  libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev,
  libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
- libbluetooth-dev, zlib1g-dev, libmms-dev (>= 0.4), libsmbclient-dev,
+ libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
  libfaad-dev, libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
  libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl
 

README.osx

@@ -110,7 +110,6 @@ Then install the following port packages (order is very important):
  $ sudo port install libvorbis +universal
  $ sudo port install libmad macosx_deployment_target=10.4
  $ sudo port install fribidi +universal
- $ sudo port install libmms +universal
  $ sudo port install wavpack +universal
  $ sudo port install libmpeg2 +no_sdl +no_x11 +universal
 

README.ubuntu

@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
 
 For Ubuntu (all versions >= 7.04):
 
-   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmms-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
+   # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libfaad-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
 
 For Ubuntu Maverick (10.10):
    # sudo apt-get install autopoint
@@ -58,15 +58,6 @@ In this case you will have to manually compile the latest version.
    # make
    # sudo make install
 
-On 8.04 and older versions, libmms is outdated and thus XBMC will not compile properly.
-In this case you will have to manually compile the latest version. See the previous [NOTICE].
-   # wget "http://launchpad.net/libmms/trunk/0.5/+download/libmms-0.5.tar.gz"
-   # tar zxvf libmms-0.5.tar.gz
-   # cd libmms-0.5
-   # ./configure --prefix=/usr
-   # make
-   # sudo make install
-
 --------------------------------------------------------------
 3.2. Use a single command to get all build dependencies
 --------------------------------------------------------------

configure.in

@@ -581,9 +581,6 @@ PKG_CHECK_MODULES([CDIO],       [libcdio],
 PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
   [INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
   AC_MSG_ERROR($missing_library))
-PKG_CHECK_MODULES([MMS],        [libmms],
-  [INCLUDES="$INCLUDES $MMS_CFLAGS"; LIBS="$LIBS $MMS_LIBS"],
-  AC_MSG_ERROR($missing_library))
 PKG_CHECK_MODULES([FREETYPE2],  [freetype2],
   [INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
   AC_MSG_ERROR($missing_library))

xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp

@@ -37,9 +37,6 @@
 #ifdef ENABLE_DVDINPUTSTREAM_STACK
 #include "DVDInputStreamStack.h"
 #endif
-#ifdef HAS_FILESYSTEM_MMS
-#include "DVDInputStreamMMS.h"
-#endif
 #include "FileItem.h"
 #include "storage/MediaManager.h"
 
@@ -86,10 +83,6 @@ CDVDInputStream* CDVDFactoryInputStream::CreateInputStream(IDVDPlayer* pPlayer,
   else if(file.substr(0, 7) == "htsp://")
     return new CDVDInputStreamHTSP();
 #endif
-#ifdef HAS_FILESYSTEM_MMS
-  else if(file.substr(0,6) == "mms://" || file.substr(0,7) == "mmsh://")
-    return new CDVDInputStreamMMS();
-#endif
 
   // our file interface handles all these types of streams
   return (new CDVDInputStreamFile());

xbmc/cores/dvdplayer/DVDInputStreams/Makefile

@@ -9,7 +9,6 @@ SRCS=	DVDFactoryInputStream.cpp \
 	DVDInputStreamHTSP.cpp \
 	DVDInputStreamHttp.cpp \
 	DVDInputStreamMemory.cpp \
-	DVDInputStreamMMS.cpp \
 	DVDInputStreamNavigator.cpp \
 	DVDInputStreamRTMP.cpp \
 	DVDInputStreamStack.cpp \

xbmc/system.h

@@ -63,7 +63,6 @@
 #define HAS_FILESYSTEM_SAP
 #define HAS_FILESYSTEM_VTP
 #define HAS_FILESYSTEM_HTSP
-#define HAS_FILESYSTEM_MMS
 
 /**********************
  * Non-free Components