cleanup: removed unnecessary headers.

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27207 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

4 files changed, 5 insertions, 167 deletions

diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.h
index 0bf086f729..b69b880396 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.h
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMMS.h
@@ -25,7 +25,11 @@
 #ifdef HAS_FILESYSTEM_MMS
 
 #include "DVDInputStream.h"
-#include "mms/mmsx.h"
+#ifdef _WIN32
+#include "libmms/libmms_win32/src/mmsx.h"
+#else
+#include <libmms/mmsx.h>
+#endif
 
 class CDVDInputStreamMMS : public CDVDInputStream
 {
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/mms/mmsx.h b/xbmc/cores/dvdplayer/DVDInputStreams/mms/mmsx.h
deleted file mode 100644
index d76af45716..0000000000
--- a/xbmc/cores/dvdplayer/DVDInputStreams/mms/mmsx.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2007 Hans de Goede <j.w.r.degoede@hhs.nl>
- *
- * This file is part of libmms a free mms protocol library
- *
- * libmms is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * libmss 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 Library 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
- *
- * libmms public header
- */
-
-/*
- * mmsx is a small wrapper around the mms and mmsh protocol implementations
- * in libmms. The mmsx functions provide transparent access to both protocols
- * so that programs who wish to support both can do so with a single code path
- * if desired.
- */
- 
-#ifndef HAVE_MMSX_H
-#define HAVE_MMSX_H
-
-#include <inttypes.h>
-#include <libmms/mmsio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef struct mmsx_s mmsx_t;
-
-mmsx_t*   mmsx_connect (mms_io_t *io, void *data, const char *url, int bandwidth);
-
-int       mmsx_read (mms_io_t *io, mmsx_t *instance, char *data, int len);
-int       mmsx_time_seek (mms_io_t *io, mmsx_t *instance, double time_sec);
-mms_off_t mmsx_seek (mms_io_t *io, mmsx_t *instance, mms_off_t offset, int origin);
-/* return total playback time in seconds */
-double    mmsx_get_time_length (mmsx_t *instance);
-/* return raw total playback time in 100 nanosecs (10^-7) */
-uint64_t  mmsx_get_raw_time_length (mmsx_t *instance);
-uint32_t  mmsx_get_length (mmsx_t *instance);
-void      mmsx_close (mmsx_t *instance);
-
-int       mmsx_peek_header (mmsx_t *instance, char *data, int maxsize);
-
-mms_off_t mmsx_get_current_pos (mmsx_t *instance);
-
-uint32_t  mmsx_get_asf_header_len (mmsx_t *);
-
-uint64_t  mmsx_get_asf_packet_len (mmsx_t *);
-
-int       mmsx_get_seekable (mmsx_t *);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif
- 
diff --git a/xbmc/lib/libmms/mms_config.h b/xbmc/lib/libmms/mms_config.h
deleted file mode 100644
index 4e1045b819..0000000000
--- a/xbmc/lib/libmms/mms_config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* libmms public autoconf settings header file */
-
-/* Define to 1 if libmms is compiled with 64 bit file offsets */
-#undef LIBMMS_HAVE_64BIT_OFF_T
diff --git a/xbmc/lib/libmms/mmsio.h b/xbmc/lib/libmms/mmsio.h
deleted file mode 100644
index 750d537c50..0000000000
--- a/xbmc/lib/libmms/mmsio.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef __MMS_IO_H__
-#define __MMS_IO_H__
-
-#include "mms_config.h"
-
-/* On 64 bit file offset capable systems, libmms' configure script adds
-   -D_FILE_OFFSET_BITS=64 to the CFLAGS. This causes off_t to be 64 bit,
-   When an app which includes this header file gets compiled without
-   -D_FILE_OFFSET_BITS=64, it should still expect / pass 64 bit ints for
-   off_t, this acomplishes this: */
-#if defined LIBMMS_HAVE_64BIT_OFF_T && !defined __MMS_C__
-#define mms_off_t int64_t
-#else
-#define mms_off_t off_t
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef mms_off_t (*mms_io_write_func)(void *data, int socket, char *buf, mms_off_t num);
-typedef mms_off_t (*mms_io_read_func)(void *data, int socket, char *buf, mms_off_t num);
-
-/* select states */
-#define MMS_IO_READ_READY    1
-#define MMS_IO_WRITE_READY   2
-
-enum
-  {
-    MMS_IO_STATUS_READY, 		/* IO can be safely performed */
-    MMS_IO_STATUS_ERROR,		/* There was IO error */
-    MMS_IO_STATUS_ABORTED,		/* IO command was (somehow)
-	   aborted. This is not error, but invalidates IO for further operations*/
-    MMS_IO_STATUS_TIMEOUT		/* Timeout was exceeded */
-  };
-
-/*
- * Waits for a file descriptor/socket to change status.
- *
- * users can use this handler to provide their own implementations,
- * for example abortable ones
- *
- * params :
- *   data          whatever parameter may be needed by implementation
- *   fd            file/socket descriptor
- *   state         MMS_IO_READ_READY, MMS_IO_WRITE_READY
- *   timeout_sec   timeout in seconds
- *
- *
- * return value :
- *   MMS_IO_READY     the file descriptor is ready for cmd
- *   MMS_IO_ERROR     an i/o error occured
- *   MMS_IO_ABORTED   command aborted
- *   MMS_IO_TIMEOUT   the file descriptor is not ready after timeout_msec milliseconds
- * every other return value is interpreted same as MMS_IO_ABORTED
- */
-typedef int (*mms_io_select_func)(void *data, int fd, int state, int timeout_msec);
-
-/*
- * open a tcp connection
- *
- * params :
- *   stream        needed for reporting errors but may be NULL
- *   host          address of target
- *   port          port on target
- *
- * returns a socket descriptor or -1 if an error occured
- */
-typedef int (*mms_io_tcp_connect_func)(void *data, const char *host, int port);
-
-typedef struct
-{
-  mms_io_select_func select;
-  void *select_data;
-  mms_io_read_func read;
-  void *read_data;
-  mms_io_write_func write;
-  void *write_data;
-  mms_io_tcp_connect_func connect;
-  void *connect_data;
-} mms_io_t;
-
-/* set default IO implementation, it will be used in absence of specific IO
-   parameter. Structure is referenced, not copied, must remain valid for entire
-   usage period. Passing NULL reverts to default, POSIX based implementation */
-void mms_set_default_io_impl(const mms_io_t *io);
-const mms_io_t* mms_get_default_io_impl();
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __MMS_IO_H__ */