[DVDnav-discuss] r1255 - trunk/libdvdread/src/dvd_input.c

[diego]

Author: diego
Date: Thu Mar 21 20:16:39 2013
New Revision: 1255

Log:
Replace deprecated dvdcss_title() function by dvdcss_seek().

Modified:
   trunk/libdvdread/src/dvd_input.c

Modified: trunk/libdvdread/src/dvd_input.c
==============================================================================
--- trunk/libdvdread/src/dvd_input.c	Thu Mar 21 18:53:40 2013	(r1254)
+++ trunk/libdvdread/src/dvd_input.c	Thu Mar 21 20:16:39 2013	(r1255)
@@ -43,7 +43,6 @@ char *      (*dvdinput_error) (dvd_input
 #define DVDcss_open(a) dvdcss_open((char*)(a))
 #define DVDcss_close   dvdcss_close
 #define DVDcss_seek    dvdcss_seek
-#define DVDcss_title   dvdcss_title
 #define DVDcss_read    dvdcss_read
 #define DVDcss_error   dvdcss_error
 #else
@@ -60,7 +59,6 @@ typedef struct dvdcss_s *dvdcss_t;
 static dvdcss_t (*DVDcss_open)  (const char *);
 static int      (*DVDcss_close) (dvdcss_t);
 static int      (*DVDcss_seek)  (dvdcss_t, int, int);
-static int      (*DVDcss_title) (dvdcss_t, int);
 static int      (*DVDcss_read)  (dvdcss_t, void *, int, int);
 static char *   (*DVDcss_error) (dvdcss_t);
 #endif
@@ -122,7 +120,7 @@ static int css_seek(dvd_input_t dev, int
  */
 static int css_title(dvd_input_t dev, int block)
 {
-  return DVDcss_title(dev->dvdcss, block);
+  return DVDcss_seek(dev->dvdcss, block, DVDCSS_SEEK_KEY);
 }
 
 /**
@@ -304,8 +302,6 @@ int dvdinput_setup(void)
       dlsym(dvdcss_library, U_S "dvdcss_open");
     DVDcss_close = (int (*)(dvdcss_t))
       dlsym(dvdcss_library, U_S "dvdcss_close");
-    DVDcss_title = (int (*)(dvdcss_t, int))
-      dlsym(dvdcss_library, U_S "dvdcss_title");
     DVDcss_seek = (int (*)(dvdcss_t, int, int))
       dlsym(dvdcss_library, U_S "dvdcss_seek");
     DVDcss_read = (int (*)(dvdcss_t, void*, int, int))
@@ -322,7 +318,7 @@ int dvdinput_setup(void)
               "http://www.videolan.org/\n" );
       dlclose(dvdcss_library);
       dvdcss_library = NULL;
-    } else if(!DVDcss_open  || !DVDcss_close || !DVDcss_title || !DVDcss_seek
+    } else if(!DVDcss_open  || !DVDcss_close || !DVDcss_seek
               || !DVDcss_read || !DVDcss_error || !dvdcss_version) {
       fprintf(stderr,  "libdvdread: Missing symbols in %s, "
               "this shouldn't happen !\n", CSS_LIB);