Diff of /src/libdvdcss.h [104348] .. [d040ac]  Maximize  Restore

  Switch to side-by-side view

--- a/src/libdvdcss.h
+++ b/src/libdvdcss.h
@@ -1,17 +1,17 @@
 /*****************************************************************************
- * libdvdcss.h: private DVD reading library data
+ * private.h: private DVD reading library data
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id$
+ * $Id: libdvdcss.h,v 1.1 2001/12/22 00:08:13 sam Exp $
  *
- * Authors: StĂŠphane Borel <stef@via.ecp.fr>
- *          Sam Hocevar <sam@zoy.org>
+ * Authors: Stéphane Borel <stef@via.ecp.fr>
+ *          Samuel Hocevar <sam@zoy.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program 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
@@ -22,48 +22,33 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-struct iovec;
-
 /*****************************************************************************
  * The libdvdcss structure
  *****************************************************************************/
 struct dvdcss_s
 {
     /* File descriptor */
-    char * psz_device;
-    int    i_fd;
-    int    i_read_fd;
-    int    i_pos;
-
-    /* File handling */
-    int ( * pf_seek )  ( dvdcss_t, int );
-    int ( * pf_read )  ( dvdcss_t, void *, int );
-    int ( * pf_readv ) ( dvdcss_t, struct iovec *, int );
+    int i_fd;
+    int i_seekpos;
 
     /* Decryption stuff */
     int          i_method;
     css_t        css;
-    int          b_ioctls;
-    int          b_scrambled;
+    boolean_t    b_ioctls;
+    boolean_t    b_encrypted;
     dvd_title_t *p_titles;
 
-    /* Key cache directory and pointer to the filename */
-    char   psz_cachefile[PATH_MAX];
-    char * psz_block;
+    /* Error management */
+    char     *psz_error;
+    boolean_t b_errors;
+    boolean_t b_debug;
 
-    /* Error management */
-    char * psz_error;
-    int    b_errors;
-    int    b_debug;
-
-#ifdef WIN32
-    int    b_file;
-    char * p_readv_buffer;
-    int    i_readv_buf_size;
-#endif
-
-#ifndef WIN32
-    int    i_raw_fd;
+#if defined( WIN32 )
+    char *p_readv_buffer;
+    int  i_readv_buf_size;
+#else
+    int i_raw_fd;
+    int i_read_fd;
 #endif
 };
 
@@ -77,28 +62,36 @@
 /*****************************************************************************
  * Functions used across the library
  *****************************************************************************/
-#define print_error(dvdcss,msg) _print_error(dvdcss,msg)
-#if defined( _MSC_VER )
-#include <stdarg.h>
-__forceinline void print_debug(dvdcss_t dvdcss, const char *msg,...)
-{
-	va_list args;
+int _dvdcss_seek  ( dvdcss_handle, int i_blocks );
+int _dvdcss_read  ( dvdcss_handle, void *p_buffer, int i_blocks );
 
-    fprintf( stderr, "libdvdcss debug: " );
-	va_start( args, msg );
-    vfprintf( stderr, msg, args );
-	va_end( args );
-    fprintf( stderr, "\n" );
-}
+/*****************************************************************************
+ * Error management
+ *****************************************************************************/
+#if defined( _WIN32 ) && defined( _MSC_VER )
+#   define DVDCSS_ERROR( x ) fprintf( stderr, "libdvdcss error: %s\n", x );
+#   define DVDCSS_DEBUG( x ) fprintf( stderr, "libdvdcss debug: %s\n", x );
 #else
-#define print_debug(dvdcss,msg,args...) \
-    if( dvdcss->b_debug ) \
-    { \
-        fprintf( stderr, "libdvdcss debug: " ); \
-        fprintf( stderr, msg, ##args ); \
-        fprintf( stderr, "\n" ); \
-    }
+#   define DVDCSS_ERROR( x... ) fprintf( stderr, "libdvdcss error: %s\n", ##x );
+#   define DVDCSS_DEBUG( x... ) fprintf( stderr, "libdvdcss debug: %s\n", ##x );
 #endif
 
-void _print_error ( dvdcss_t, char * );
+static __inline__ void _dvdcss_error( dvdcss_handle dvdcss, char *psz_string )
+{
+    if( dvdcss->b_errors )
+    {
+        DVDCSS_ERROR( psz_string );
+    }
 
+    dvdcss->psz_error = psz_string;
+}
+
+static __inline__ void _dvdcss_debug( dvdcss_handle dvdcss, char *psz_string )
+{
+    if( dvdcss->b_debug )
+    {
+        DVDCSS_DEBUG( psz_string );
+    }
+}
+
+

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks