* Fixed the whitespace/tab issues in the Makefile.
  * Corrected an awful typo in the version name, I hope Lieutenant Commander
    Arkady Grigorovich Ourumov will never set up us the bomb for that.
  * Removed deprecated stuff from config.h.
  * Disabled message queue by default.
  * A few other changes in the CSS code, the BeOS issues should be fixed.
  * Fixed a memory leak in gtk_callbacks.c (thanks to Dae).

Makefile.in

@@ -507,14 +507,14 @@ install:
 ifneq (,$(findstring darwin,$(SYS)))
 # XXX this should only be for MacOS X
 #should the following be "$(DESTDIR)$(bindir)vlc.app/" or "$(DESTDIR)vlc.app/" ?
-    mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS
-    mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/lib
-    mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/share
-    $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist $(DESTDIR)$(bindir)vlc.app/Contents/
-    $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo $(DESTDIR)$(bindir)vlc.app/Contents/
-    $(INSTALL) vlc $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/
-    $(INSTALL) $(PLUGINS:%=lib/%.so) $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/lib
-    $(INSTALL) -m 644 share/*.psf $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/share
+	mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS
+	mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/lib
+	mkdir -p $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/share
+	$(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist $(DESTDIR)$(bindir)vlc.app/Contents/
+	$(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo $(DESTDIR)$(bindir)vlc.app/Contents/
+	$(INSTALL) vlc $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/
+	$(INSTALL) $(PLUGINS:%=lib/%.so) $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/lib
+	$(INSTALL) -m 644 share/*.psf $(DESTDIR)$(bindir)vlc.app/Contents/MacOS/share
 endif
 
 show:
@@ -683,14 +683,14 @@ endif
 
 vlc.app: all
 ifneq (,$(findstring darwin,$(SYS)))
-    mkdir -p vlc.app/Contents/MacOS
-    mkdir -p vlc.app/Contents/MacOS/lib
-    mkdir -p vlc.app/Contents/MacOS/share
-    $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
-    $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
-    $(INSTALL) vlc vlc.app/Contents/MacOS/
-    $(INSTALL) $(PLUGINS:%=lib/%.so) vlc.app/Contents/MacOS/lib
-    $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+	mkdir -p vlc.app/Contents/MacOS
+	mkdir -p vlc.app/Contents/MacOS/lib
+	mkdir -p vlc.app/Contents/MacOS/share
+	$(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
+	$(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
+	$(INSTALL) vlc vlc.app/Contents/MacOS/
+	$(INSTALL) $(PLUGINS:%=lib/%.so) vlc.app/Contents/MacOS/lib
+	$(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
 endif
 
 #

configure.in

@@ -6,7 +6,7 @@ AC_CANONICAL_HOST
 
 VLC_VERSION=0.2.70
 AC_SUBST(VLC_VERSION)
-VLC_CODENAME=Urumov
+VLC_CODENAME=Ourumov
 AC_SUBST(VLC_CODENAME)
 
 dnl Check for tools

include/config.h.in

@@ -63,17 +63,10 @@
  * and might cause problems with some very weird streams. */
 //#define MPEG2_COMPLIANT
 
-/* Define for profiling and statistics support - such informations, like FPS
- * or pictures count won't be available if it not set */
-/* #define STATS --moved in Makefile */
-
-/* Define for unthreaded version of the program FIXME: not yet implemented ??*/
-//#define NO_THREAD
-
 /*****************************************************************************
  * Debugging options - define or undefine symbols
  *****************************************************************************/
-#if DEBUG == 1
+#ifdef DEBUG
 /* General debugging support, which depends of the DEBUG define, is determined
  * in the Makefile */
 
@@ -449,7 +442,7 @@
  * when debugging, since it allows messages which would not be printed
  * due to a crash to be printed anyway */
 #ifndef DEBUG
-#define INTF_MSG_QUEUE
+//#define INTF_MSG_QUEUE
 #endif
 
 /* Format of the header for debug messages. The arguments following this header

plugins/dvd/dvd_css.c

@@ -2,7 +2,7 @@
  * dvd_css.c: Functions for DVD authentification and unscrambling
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_css.c,v 1.23 2001/04/10 17:47:05 stef Exp $
+ * $Id: dvd_css.c,v 1.24 2001/04/11 04:31:59 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -56,7 +56,7 @@
  * Local prototypes
  *****************************************************************************/
 #ifdef HAVE_CSS
-static int  CSSGetASF    ( css_t *p_css );
+static int  CSSGetASF    ( int i_fd );
 static void CSSCryptKey  ( int i_key_type, int i_varient,
                            u8 const * pi_challenge, u8* pi_key );
 static int  CSSCracker   ( int i_start, unsigned char * p_crypted,
@@ -92,18 +92,17 @@ int CSSTest( int i_fd )
  * Since we don't need the disc key to find the title key, we just run the
  * basic unavoidable commands to authenticate device and disc.
  *****************************************************************************/
-int CSSInit( css_t * p_css )
+int CSSInit( int i_fd, css_t * p_css )
 {
 #ifdef HAVE_CSS
     /* structures defined in cdrom.h or dvdio.h */
     char p_buffer[2048 + 4 + 1];
+    int  i_agid = 0;
     int  i_ret = -1;
     int  i;
 
-    p_css->i_agid = 0;
-
     /* Test authentication success */
-    switch( CSSGetASF( p_css ) )
+    switch( CSSGetASF( i_fd ) )
     {
         case -1:
             return -1;
@@ -121,7 +120,7 @@ int CSSInit( css_t * p_css )
     {
         intf_WarnMsg( 3, "css info: requesting AGID %d", i );
 
-        i_ret = ioctl_LUSendAgid( p_css );
+        i_ret = ioctl_LUSendAgid( i_fd, &i_agid );
 
         if( i_ret != -1 )
         {
@@ -131,8 +130,8 @@ int CSSInit( css_t * p_css )
 
         intf_ErrMsg( "css error: ioctl_LUSendAgid failed, invalidating" );
 
-        p_css->i_agid = 0;
-        ioctl_InvalidateAgid( p_css );
+        i_agid = 0;
+        ioctl_InvalidateAgid( i_fd, &i_agid );
     }
 
     /* Unable to authenticate without AGID */
@@ -154,14 +153,14 @@ int CSSInit( css_t * p_css )
     }
 
     /* Send challenge to LU */
-    if( ioctl_HostSendChallenge( p_css, p_buffer ) < 0 )
+    if( ioctl_HostSendChallenge( i_fd, &i_agid, p_buffer ) < 0 )
     {
         intf_ErrMsg( "css error: ioctl_HostSendChallenge failed" );
         return -1;
     }
 
     /* Get key1 from LU */
-    if( ioctl_LUSendKey1( p_css, p_buffer ) < 0)
+    if( ioctl_LUSendKey1( i_fd, &i_agid, p_buffer ) < 0)
     {
         intf_ErrMsg( "css error: ioctl_LUSendKey1 failed" );
         return -1;
@@ -194,7 +193,7 @@ int CSSInit( css_t * p_css )
     }
 
     /* Get challenge from LU */
-    if( ioctl_LUSendChallenge( p_css, p_buffer ) < 0 )
+    if( ioctl_LUSendChallenge( i_fd, &i_agid, p_buffer ) < 0 )
     {
         intf_ErrMsg( "css error: ioctl_LUSendKeyChallenge failed" );
         return -1;
@@ -216,7 +215,7 @@ int CSSInit( css_t * p_css )
     }
 
     /* Send key2 to LU */
-    if( ioctl_HostSendKey2( p_css, p_buffer ) < 0 )
+    if( ioctl_HostSendKey2( i_fd, &i_agid, p_buffer ) < 0 )
     {
         intf_ErrMsg( "css error: ioctl_HostSendKey2 failed" );
         return -1;
@@ -226,18 +225,19 @@ int CSSInit( css_t * p_css )
 
     memcpy( p_css->disc.pi_challenge, p_css->disc.pi_key1, KEY_SIZE );
     memcpy( p_css->disc.pi_challenge+KEY_SIZE, p_css->disc.pi_key2, KEY_SIZE );
+
     CSSCryptKey( 2, p_css->disc.i_varient, p_css->disc.pi_challenge,
-                                               p_css->disc.pi_key_check );
+                                           p_css->disc.pi_key_check );
 
-    intf_WarnMsg( 1, "css info: received Session Key" );
+    intf_WarnMsg( 1, "css info: received session key" );
 
-    if( p_css->i_agid < 0 )
+    if( i_agid < 0 )
     {
         return -1;
     }
 
     /* Test authentication success */
-    switch( CSSGetASF( p_css ) )
+    switch( CSSGetASF( i_fd ) )
     {
         case -1:
             return -1;
@@ -251,7 +251,7 @@ int CSSInit( css_t * p_css )
     }
 
     /* Get encrypted disc key */
-    if( ioctl_ReadKey( p_css, p_buffer ) < 0 )
+    if( ioctl_ReadKey( i_fd, &i_agid, p_buffer ) < 0 )
     {
         intf_ErrMsg( "css error: ioctl_ReadKey failed" );
         return -1;
@@ -265,7 +265,7 @@ int CSSInit( css_t * p_css )
     memcpy( p_css->disc.pi_key_check, p_buffer, 2048 );
 
     /* Test authentication success */
-    switch( CSSGetASF( p_css ) )
+    switch( CSSGetASF( i_fd ) )
     {
         case -1:
             return -1;
@@ -292,7 +292,7 @@ int CSSInit( css_t * p_css )
  *****************************************************************************
  * The DVD should have been opened and authenticated before.
  *****************************************************************************/
-int CSSGetKey( css_t * p_css )
+int CSSGetKey( int i_fd, css_t * p_css )
 {
 #ifdef HAVE_CSS
     /*
@@ -330,8 +330,8 @@ int CSSGetKey( css_t * p_css )
 //fprintf( stderr, "CSS %d start pos: %lld\n", i_title, i_pos );
 
     do {
-    i_pos = lseek( p_css->i_fd, i_pos, SEEK_SET );
-    i_bytes_read = read( p_css->i_fd, pi_buf, 0x800 );
+    i_pos = lseek( i_fd, i_pos, SEEK_SET );
+    i_bytes_read = read( i_fd, pi_buf, 0x800 );
 
     /* PES_scrambling_control */
     if( pi_buf[0x14] & 0x30 )
@@ -542,25 +542,24 @@ int CSSDescrambleSector( dvd_key_t pi_key, u8* pi_sec )
  *  0 if the device needs to be authenticated,
  *  1 either.
  *****************************************************************************/
-static int CSSGetASF( css_t *p_css )
+static int CSSGetASF( int i_fd )
 {
-    int i_oldagid = p_css->i_agid, i_asf = 0;
+    int i_agid;
+    int i_asf = 0;
 
-    for( p_css->i_agid = 0 ; p_css->i_agid < 4 ; p_css->i_agid++ )
+    for( i_agid = 0 ; i_agid < 4 ; i_agid++ )
     {
-        if( ioctl_LUSendASF( p_css, &i_asf ) == 0 )
+        if( ioctl_LUSendASF( i_fd, &i_agid, &i_asf ) == 0 )
         {
-            intf_WarnMsg( 3, "css info: %sauthenticated", i_asf ? "":"not " );
+            intf_WarnMsg( 3, "css info: GetASF %sauthenticated",
+                          i_asf ? "":"not " );
 
-            p_css->i_agid = i_oldagid;
             return i_asf;
         }
     }
 
     /* The ioctl process has failed */
     intf_ErrMsg( "css error: GetASF fatal error" );
-
-    p_css->i_agid = i_oldagid;
     return -1;
 }
 

plugins/dvd/dvd_css.h

@@ -2,7 +2,7 @@
  * dvd_css.h: Structures for DVD authentification and unscrambling
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_css.h,v 1.6 2001/04/02 23:30:41 sam Exp $
+ * $Id: dvd_css.h,v 1.7 2001/04/11 04:31:59 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -47,7 +47,6 @@ typedef struct title_key_s
 
 typedef struct css_s
 {
-    int             i_fd;
     int             i_agid;
     disc_t          disc;
     u8              pi_disc_key[2048];

plugins/dvd/dvd_ioctl.h

@@ -2,7 +2,7 @@
  * dvd_ioctl.h: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ioctl.h,v 1.5 2001/04/04 02:49:18 sam Exp $
+ * $Id: dvd_ioctl.h,v 1.6 2001/04/11 04:31:59 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -22,15 +22,15 @@
  *****************************************************************************/
 
 int ioctl_ReadCopyright     ( int, int, int * );
-int ioctl_ReadKey           ( css_t *, u8 * );
+int ioctl_ReadKey           ( int, int *, u8 * );
 
-int ioctl_LUSendAgid        ( css_t * );
-int ioctl_LUSendChallenge   ( css_t *, u8 * );
-int ioctl_LUSendKey1        ( css_t *, u8 * );
-int ioctl_LUSendASF         ( css_t *, int * );
-int ioctl_InvalidateAgid    ( css_t * );
-int ioctl_HostSendChallenge ( css_t *, u8 * );
-int ioctl_HostSendKey2      ( css_t *, u8 * );
+int ioctl_LUSendAgid        ( int, int * );
+int ioctl_LUSendChallenge   ( int, int *, u8 * );
+int ioctl_LUSendKey1        ( int, int *, u8 * );
+int ioctl_LUSendASF         ( int, int *, int * );
+int ioctl_InvalidateAgid    ( int, int * );
+int ioctl_HostSendChallenge ( int, int *, u8 * );
+int ioctl_HostSendKey2      ( int, int *, u8 * );
 
 #ifdef SYS_BEOS
 

plugins/dvd/input_dvd.c

@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.41 2001/04/10 17:47:05 stef Exp $
+ * $Id: input_dvd.c,v 1.42 2001/04/11 04:31:59 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -528,7 +528,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
                     vts.i_pos +
                     vts.manager_inf.i_title_vob_start_sector * DVD_LB_SIZE;
 
-            j = CSSGetKey( p_dvd->p_css );
+            j = CSSGetKey( p_input->i_handle, p_dvd->p_css );
             if( j < 0 )
             {
                 intf_ErrMsg( "dvd error: fatal error in vts css key" );
@@ -865,10 +865,7 @@ static void DVDInit( input_thread_t * p_input )
             return;
         }
 
-        p_dvd->p_css->i_fd = p_input->i_handle;
-        p_dvd->p_css->i_agid = 0;
-
-        if( CSSInit( p_dvd->p_css ) < 0 )
+        if( CSSInit( p_input->i_handle, p_dvd->p_css ) < 0 )
         {
             intf_ErrMsg( "dvd error: fatal failure in CSS" );
             free( p_dvd->p_css );

plugins/dvd/input_dvd.h

@@ -2,7 +2,7 @@
  * input_dvd.h: thread structure of the DVD plugin
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_dvd.h,v 1.17 2001/04/10 17:47:05 stef Exp $
+ * $Id: input_dvd.h,v 1.18 2001/04/11 04:31:59 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -68,8 +68,8 @@ typedef struct thread_dvd_data_s
  * Prototypes in dvd_css.c
  *****************************************************************************/
 int   CSSTest             ( int );
-int   CSSInit             ( struct css_s * );
-int   CSSGetKey           ( struct css_s * );
+int   CSSInit             ( int, struct css_s * );
+int   CSSGetKey           ( int, struct css_s * );
 int   CSSDescrambleSector ( u8 * , u8 * );
 
 /*****************************************************************************
@@ -80,4 +80,3 @@ int   IfoInit     ( struct ifo_s * );
 int   IfoTitleSet ( struct ifo_s * );
 void  IfoEnd      ( struct ifo_s * );
 
-

plugins/gtk/gtk_callbacks.c

@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.13 2001/04/08 13:09:32 octplane Exp $
+ * $Id: gtk_callbacks.c,v 1.14 2001/04/11 04:31:59 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -545,6 +545,7 @@ on_disc_ok_clicked                     (GtkButton       *button,
     /* Build source name and add it to playlist */
     sprintf( psz_source, "%s:%s", psz_method, psz_device );
     intf_PlaylistAdd( p_main->p_playlist, PLAYLIST_END, psz_source );
+    free( psz_source );
 
     gtk_widget_hide( p_intf->p_sys->p_disc );
 }