Mercurial > libdvdread4.hg
changeset 80:d59aaee50e47 src
Replace deprecated dvdcss_title() function by dvdcss_seek().
| author | diego |
|---|---|
| date | Thu, 21 Mar 2013 19:16:39 +0000 |
| parents | dbfcd120bf24 |
| children | 7e9feef7a82d |
| files | dvd_input.c |
| diffstat | 1 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/dvd_input.c Thu Mar 21 17:53:40 2013 +0000 +++ b/dvd_input.c Thu Mar 21 19:16:39 2013 +0000 @@ -43,7 +43,6 @@ #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 @@ 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_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 @@ 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 @@ "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);