* Fixed a warning for *BSD compilation.
  * Fixed a typo in yesterday's Darwin ioctl fixes.
  * Patch by Eugenio so that the OS X interface and video output handle the
    aout and vout banks.

plugins/dvd/dvd_ioctl.c

@@ -2,7 +2,7 @@
  * dvd_ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ioctl.c,v 1.12 2001/05/25 04:23:37 sam Exp $
+ * $Id: dvd_ioctl.c,v 1.13 2001/05/25 13:20:09 sam Exp $
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -252,7 +252,7 @@ int ioctl_ReportAgid( int i_fd, int *pi_agid )
 
     i_ret = ioctl( i_fd, IODVD_REPORT_KEY, &dvdioctl );
 
-    *pi_asf = p_buffer[ 7 ] >> 6;
+    *pi_agid = p_buffer[ 7 ] >> 6;
 
 #else
     /* DVD ioctls unavailable - do as if the ioctl failed */

plugins/macosx/macosx_common.h

@@ -69,7 +69,4 @@ typedef struct vout_sys_s
     Ptr				theBase;
     int				theRow;
     int				theDepth;
-
-    int playback_status;		// remember playback state
-    int vol_val;	// remember the current volume
 } vout_sys_t;

plugins/macosx/vout_macosx.c

@@ -456,7 +456,8 @@ static void vout_Display( vout_thread_t *p_vout )
 {
 //    intf_ErrMsg( "vout_Display()" );
 
-    if ( p_vout->p_sys->playback_status != PAUSED &&  p_vout->p_sys->playback_status != STOPPED )
+//we should not be called if we set the status to paused or stopped via the interface
+//    if ( p_vout->p_sys->playback_status != PAUSED &&  p_vout->p_sys->playback_status != STOPPED )
         BlitToWindow ( p_vout, p_vout->i_buffer_index );
 }
 

plugins/sdl/vout_sdl.c

@@ -2,7 +2,7 @@
  * vout_sdl.c: SDL video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_sdl.c,v 1.51 2001/05/07 04:42:42 sam Exp $
+ * $Id: vout_sdl.c,v 1.52 2001/05/25 13:20:09 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Pierre Baillet <oct@zoy.org>
@@ -35,6 +35,10 @@
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
 
+#ifndef WIN32
+#include <netinet/in.h>                               /* BSD: struct in_addr */
+#endif
+
 #include <SDL/SDL.h>
 
 #include "config.h"

plugins/x11/vout_x11.c

@@ -2,7 +2,7 @@
  * vout_x11.c: X11 video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vout_x11.c,v 1.24 2001/05/07 03:14:09 stef Exp $
+ * $Id: vout_x11.c,v 1.25 2001/05/25 13:20:09 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -42,6 +42,10 @@
 #include <sys/ipc.h>
 #endif
 
+#ifndef WIN32
+#include <netinet/in.h>                               /* BSD: struct in_addr */
+#endif
+
 #include <sys/shm.h>                                   /* shmget(), shmctl() */
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

plugins/x11/vout_xvideo.c

@@ -2,7 +2,7 @@
  * vout_xvideo.c: Xvideo video output display method
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: vout_xvideo.c,v 1.16 2001/05/07 04:42:42 sam Exp $
+ * $Id: vout_xvideo.c,v 1.17 2001/05/25 13:20:09 sam Exp $
  *
  * Authors: Shane Harper <shanegh@optusnet.com.au>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -43,6 +43,10 @@
 #include <sys/ipc.h>
 #endif
 
+#ifndef WIN32
+#include <netinet/in.h>                               /* BSD: struct in_addr */
+#endif
+
 #include <sys/shm.h>                                   /* shmget(), shmctl() */
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

src/input/input.c

@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.108 2001/05/19 00:39:30 stef Exp $
+ * $Id: input.c,v 1.109 2001/05/25 13:20:10 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -73,8 +73,6 @@
 
 #include "main.h"
 
- /* #include <netutils.h> */
-
 
 /*****************************************************************************
  * Local prototypes