From e46ac635c2c28d80706f02f239bb847c7e48c34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Fri, 27 Aug 2004 19:33:17 +0000
Subject: MINGW32 port. Engine library and most of plugins compiles now. List
 of some changes:  - replaced some _MSC_VER by more common WIN32  - define
 INTLDIR, remove -static flag for included intl  - shared more common CFLAGS
 with DEBUG_CFLAGS  - use WIN32_CFLAGS for all building  - separate some flags
 into THREAD_CFLAGS_CONFIG,    THREAD_CFLAGS_CONFIG and ZLIB_LIB_CONFIG for
 public xine-config,    automatically use internal libs if necessary  - don't
 warn about missing X for mingw and cygwin  - libw32dll disabled for WIN32
 (making native loader would be    interesting, or porting wine code to
 Windows? :->)  - DVB and RTP disabled for WIN32, not ported yet  - fix build
 and fix a warning in cdda  - fix build for nosefart and libfaad  - implement
 configure option --disable-freetype  - sync libxine.pc and xine-config.in  -
 add -liberty to goom under WIN32  - move original build files from included
 phread and zlib into archives    and replace them by autotools

CVS patchset: 6910
CVS date: 2004/08/27 19:33:17
---
 src/input/input_cdda.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/input/input_cdda.c')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 4b3c40d92..43c5f98c0 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.63 2004/07/27 18:06:45 mroi Exp $
+ * $Id: input_cdda.c,v 1.64 2004/08/27 19:33:20 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -37,11 +37,17 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef _MSC_VER 
-#include <sys/ioctl.h>
-#include <netdb.h>
+#ifdef HAVE_SYS_IOCTL_H
+#  include <sys/ioctl.h>
 #else
-#include <timer.h> /* alarm() */
+/* for WIN32 */
+#  include <winioctl.h>
+#endif
+
+#include <netdb.h>
+
+#ifdef _MSC_VER 
+#  include <timer.h> /* alarm() */
 #endif /* _MSC_VER */
 
 #include <signal.h>
@@ -61,10 +67,6 @@
 #include "input_plugin.h"
 #include "media_helper.h"
 
-#ifdef WIN32
-#include <winioctl.h>
-#endif
-
 #if defined(__sun)
 #define	DEFAULT_CDDA_DEVICE	"/vol/dev/aliases/cdrom0"
 #elif defined(WIN32)
@@ -942,6 +944,7 @@ static int network_command( xine_stream_t *stream, int socket, char *data_buf, c
 }
 
 
+#ifndef WIN32
 static int network_connect(xine_stream_t *stream,  char *url )
 {
   char *host;
@@ -970,7 +973,7 @@ static int network_connect(xine_stream_t *stream,  char *url )
   }
   return fd;
 }
-                   
+
 static int network_read_cdrom_toc(xine_stream_t *stream, int fd, cdrom_toc *toc) {
 
   char buf[_BUFSIZ];
@@ -1033,6 +1036,8 @@ static int network_read_cdrom_toc(xine_stream_t *stream, int fd, cdrom_toc *toc)
 
   return 0;
 }
+#endif /* WIN32 */
+
 
 static int network_read_cdrom_frames(xine_stream_t *stream, int fd, int first_frame, int num_frames,
   unsigned char data[CD_RAW_FRAME_SIZE]) {
@@ -1812,9 +1817,8 @@ static int cdda_open(cdda_input_plugin_t *this_gen,
 
   int fd = -1;
 
-  if ( !cdda_device ) return -1;
-
 #ifndef WIN32
+  if ( !cdda_device ) return -1;
  
   *fdd = -1;
 
@@ -1846,6 +1850,7 @@ static int cdda_open(cdda_input_plugin_t *this_gen,
   return 0;
 
 #else /* WIN32 */
+  if ( !cdda_device ) return -1;
 
   *fdd = -1;
 
-- 
cgit v1.2.3