* Got rid of DVDCSS_SEEK_INI in libdvdcss.

diff --git a/ChangeLog.libdvdcss b/ChangeLog.libdvdcss
index 09e81867579c26d14fe19ad14704b8b2f44d9cb3..dd0f330b11505230a200f536d50588d05097edb0 100644 (file)
--- a/ChangeLog.libdvdcss
+++ b/ChangeLog.libdvdcss
@@ -9,6 +9,7 @@ HEAD
 1.0.0
 Mon, 12 Nov 2001 17:14:29 +0100
 
+  * Got rid of DVDCSS_SEEK_INI.
   * Removed the i_flags argument to dvdcss_open. Everything is done through
     environment variables now.
   * Fixed a buffer overflow in CSSAuth().

diff --git a/extras/libdvdcss/libdvdcss.c b/extras/libdvdcss/libdvdcss.c
index fffb07ddf815f496c21a6c538482f8eefaf0ef8f..cfc7e6e8b7efb1643e8bdfc3996ff09e4d96ef21 100644 (file)
--- a/extras/libdvdcss/libdvdcss.c
+++ b/extras/libdvdcss/libdvdcss.c
@@ -2,7 +2,7 @@
  * libdvdcss.c: DVD reading library.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: libdvdcss.c,v 1.19 2001/11/12 20:16:33 sam Exp $
+ * $Id: libdvdcss.c,v 1.20 2001/11/13 01:25:05 sam Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -201,9 +201,8 @@ extern char * dvdcss_error ( dvdcss_handle dvdcss )
 extern int dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks, int i_flags )
 {
     /* title cracking method is too slow to be used at each seek */
-    if( ( ( i_flags & DVDCSS_SEEK_MPEG )
-             && ( dvdcss->i_method != DVDCSS_METHOD_TITLE ) )
-       || ( i_flags & DVDCSS_SEEK_INI ) )
+    if( !( i_flags & DVDCSS_SEEK_MPEG )
+             || ( dvdcss->i_method != DVDCSS_METHOD_TITLE ) )
     {
         /* check the title key */
         if( dvdcss_title( dvdcss, i_blocks ) ) 

diff --git a/extras/libdvdcss/videolan/dvdcss.h b/extras/libdvdcss/videolan/dvdcss.h
index 886c0e6698692d4b58b8746170bf1ff487083aa2..65637576d4838f3d530a3fe49d9c65514236f8bd 100644 (file)
--- a/extras/libdvdcss/videolan/dvdcss.h
+++ b/extras/libdvdcss/videolan/dvdcss.h
@@ -2,7 +2,7 @@
  * libdvdcss.h: DVD reading library, exported functions.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: dvdcss.h,v 1.8 2001/11/12 20:16:33 sam Exp $
+ * $Id: dvdcss.h,v 1.9 2001/11/13 01:25:05 sam Exp $
  *
  * Authors: Stéphane Borel <stef@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -28,16 +28,13 @@
 typedef struct dvdcss_s* dvdcss_handle;
 
 /*****************************************************************************
- * Flags
+ * Defines and flags
  *****************************************************************************/
-#define DVDCSS_NOFLAGS         0
+#define DVDCSS_BLOCK_SIZE      2048
 
+#define DVDCSS_NOFLAGS         0
 #define DVDCSS_READ_DECRYPT    (1 << 0)
-
-#define DVDCSS_SEEK_INI        (1 << 0)
-#define DVDCSS_SEEK_MPEG       (2 << 0)
-
-#define DVDCSS_BLOCK_SIZE      2048
+#define DVDCSS_SEEK_MPEG       (1 << 0)
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/plugins/dvd/dummy_dvdcss.h b/plugins/dvd/dummy_dvdcss.h
index f1c80cc3a24980b21fd554112e45bde35f4ade8a..59190a6ebb4e909e17e5f872c41b28abb3430469 100644 (file)
--- a/plugins/dvd/dummy_dvdcss.h
+++ b/plugins/dvd/dummy_dvdcss.h
@@ -2,7 +2,7 @@
  * dummy_dvdcss.h: Dummy libdvdcss header.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: dummy_dvdcss.h,v 1.3 2001/11/12 20:16:33 sam Exp $
+ * $Id: dummy_dvdcss.h,v 1.4 2001/11/13 01:25:05 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -27,23 +27,13 @@
 typedef struct dvdcss_s* dvdcss_handle;
 
 /*****************************************************************************
- * Flags
+ * Defines and flags
  *****************************************************************************/
-#define DVDCSS_NOFLAGS         0
-
-#define DVDCSS_READ_DECRYPT    (1 << 0)
-
-#define DVDCSS_SEEK_INI        (1 << 0)
-#define DVDCSS_SEEK_MPEG       (2 << 0)
-
 #define DVDCSS_BLOCK_SIZE      2048
 
-/*****************************************************************************
- * libdvdcss method: used like init flags
- *****************************************************************************/
-#define DVDCSS_KEY        0
-#define DVDCSS_DISC       1
-#define DVDCSS_TITLE      2
+#define DVDCSS_NOFLAGS         0
+#define DVDCSS_READ_DECRYPT    (1 << 0)
+#define DVDCSS_SEEK_MPEG       (1 << 0)
 
 /*****************************************************************************
  * Exported prototypes

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 13eba44fc6404af42f76b4bdab9b6dd6e163aaa4..d7803b761ae4f8ac1e55d7c90297b2a8ed2ce906 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/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.96 2001/11/12 20:16:33 sam Exp $
+ * $Id: input_dvd.c,v 1.97 2001/11/13 01:25:05 sam Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -482,7 +482,8 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
         /* Force libdvdcss to check its title key.
          * It is only useful for title cracking method. Methods using the
          * decrypted disc key are fast enough to check the key at each seek */
-        if( dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start, DVDCSS_SEEK_INI ) < 0 )
+        if( dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start,
+                                           DVDCSS_NOFLAGS ) < 0 )
         {
             intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
             return -1;