Mercurial > mplayer.hg
changeset 19820:e5d97c5f3c32
Move dvdcss.h to a dvdcss subdirectory, just like upstream libdvdcss does.
This considerably reduces our local patch size.
| author | diego |
|---|---|
| date | Wed, 13 Sep 2006 13:36:49 +0000 |
| parents | 76d294537ff6 |
| children | 9c79fe0945db |
| files | libmpdvdkit2/FILES libmpdvdkit2/css.c libmpdvdkit2/device.c libmpdvdkit2/dvd_input.c libmpdvdkit2/dvdcss.h libmpdvdkit2/dvdcss/dvdcss.h libmpdvdkit2/error.c libmpdvdkit2/libdvdcss.c libmpdvdkit2/libdvdcss_changes.diff libmpdvdkit2/libdvdread_changes.diff |
| diffstat | 10 files changed, 104 insertions(+), 144 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdvdkit2/FILES Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/FILES Wed Sep 13 13:36:49 2006 +0000 @@ -34,7 +34,7 @@ csstables.h device.c device.h -dvdcss.h +dvdcss/dvdcss.h error.c ioctl.c ioctl.h
--- a/libmpdvdkit2/css.c Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/css.c Wed Sep 13 13:36:49 2006 +0000 @@ -56,7 +56,7 @@ # include <limits.h> #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h"
--- a/libmpdvdkit2/device.c Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/device.c Wed Sep 13 13:36:49 2006 +0000 @@ -58,7 +58,7 @@ # include <sys/uio.h> /* struct iovec */ #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h"
--- a/libmpdvdkit2/dvd_input.c Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/dvd_input.c Wed Sep 13 13:36:49 2006 +0000 @@ -41,7 +41,7 @@ #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_close dvdcss_close #define DVDcss_seek dvdcss_seek
--- a/libmpdvdkit2/dvdcss.h Wed Sep 13 13:19:20 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,97 +0,0 @@ -/** - * \file dvdcss.h - * \author Stéphane Borel <stef@via.ecp.fr> - * \author Samuel Hocevar <sam@zoy.org> - * \brief The \e libdvdcss public header. - * - * This header contains the public types and functions that applications - * using \e libdvdcss may use. - */ - -/* - * Copyright (C) 1998-2002 VideoLAN - * $Id$ - * - * 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ - -#ifndef _DVDCSS_DVDCSS_H -#ifndef _DOXYGEN_SKIP_ME -#define _DVDCSS_DVDCSS_H 1 -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/** Library instance handle, to be used for each library call. */ -typedef struct dvdcss_s* dvdcss_t; - - -/** The block size of a DVD. */ -#define DVDCSS_BLOCK_SIZE 2048 - -/** The default flag to be used by \e libdvdcss functions. */ -#define DVDCSS_NOFLAGS 0 - -/** Flag to ask dvdcss_read() to decrypt the data it reads. */ -#define DVDCSS_READ_DECRYPT (1 << 0) - -/** Flag to tell dvdcss_seek() it is seeking in MPEG data. */ -#define DVDCSS_SEEK_MPEG (1 << 0) - -/** Flag to ask dvdcss_seek() to check the current title key. */ -#define DVDCSS_SEEK_KEY (1 << 1) - - -/* - * Our version number. The variable name contains the interface version. - */ -extern char * dvdcss_interface_2; - - -/* - * Exported prototypes. - */ -extern dvdcss_t dvdcss_open ( char *psz_target ); -extern int dvdcss_close ( dvdcss_t ); -extern int dvdcss_seek ( dvdcss_t, - int i_blocks, - int i_flags ); -extern int dvdcss_read ( dvdcss_t, - void *p_buffer, - int i_blocks, - int i_flags ); -extern int dvdcss_readv ( dvdcss_t, - void *p_iovec, - int i_blocks, - int i_flags ); -extern char * dvdcss_error ( dvdcss_t ); - - -/* - * Deprecated stuff. - */ -#ifndef _DOXYGEN_SKIP_ME -#define dvdcss_title(a,b) dvdcss_seek(a,b,DVDCSS_SEEK_KEY) -#define dvdcss_handle dvdcss_t -#endif - - -#ifdef __cplusplus -} -#endif - -#endif /* <dvdcss/dvdcss.h> */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdvdkit2/dvdcss/dvdcss.h Wed Sep 13 13:36:49 2006 +0000 @@ -0,0 +1,97 @@ +/** + * \file dvdcss.h + * \author Stéphane Borel <stef@via.ecp.fr> + * \author Samuel Hocevar <sam@zoy.org> + * \brief The \e libdvdcss public header. + * + * This header contains the public types and functions that applications + * using \e libdvdcss may use. + */ + +/* + * Copyright (C) 1998-2002 VideoLAN + * $Id$ + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + +#ifndef _DVDCSS_DVDCSS_H +#ifndef _DOXYGEN_SKIP_ME +#define _DVDCSS_DVDCSS_H 1 +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/** Library instance handle, to be used for each library call. */ +typedef struct dvdcss_s* dvdcss_t; + + +/** The block size of a DVD. */ +#define DVDCSS_BLOCK_SIZE 2048 + +/** The default flag to be used by \e libdvdcss functions. */ +#define DVDCSS_NOFLAGS 0 + +/** Flag to ask dvdcss_read() to decrypt the data it reads. */ +#define DVDCSS_READ_DECRYPT (1 << 0) + +/** Flag to tell dvdcss_seek() it is seeking in MPEG data. */ +#define DVDCSS_SEEK_MPEG (1 << 0) + +/** Flag to ask dvdcss_seek() to check the current title key. */ +#define DVDCSS_SEEK_KEY (1 << 1) + + +/* + * Our version number. The variable name contains the interface version. + */ +extern char * dvdcss_interface_2; + + +/* + * Exported prototypes. + */ +extern dvdcss_t dvdcss_open ( char *psz_target ); +extern int dvdcss_close ( dvdcss_t ); +extern int dvdcss_seek ( dvdcss_t, + int i_blocks, + int i_flags ); +extern int dvdcss_read ( dvdcss_t, + void *p_buffer, + int i_blocks, + int i_flags ); +extern int dvdcss_readv ( dvdcss_t, + void *p_iovec, + int i_blocks, + int i_flags ); +extern char * dvdcss_error ( dvdcss_t ); + + +/* + * Deprecated stuff. + */ +#ifndef _DOXYGEN_SKIP_ME +#define dvdcss_title(a,b) dvdcss_seek(a,b,DVDCSS_SEEK_KEY) +#define dvdcss_handle dvdcss_t +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* <dvdcss/dvdcss.h> */
--- a/libmpdvdkit2/error.c Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/error.c Wed Sep 13 13:36:49 2006 +0000 @@ -37,7 +37,7 @@ # include <limits.h> #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h"
--- a/libmpdvdkit2/libdvdcss.c Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/libdvdcss.c Wed Sep 13 13:36:49 2006 +0000 @@ -127,7 +127,7 @@ # include <direct.h> #endif -#include "dvdcss.h" +#include "dvdcss/dvdcss.h" #include "common.h" #include "css.h"
--- a/libmpdvdkit2/libdvdcss_changes.diff Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/libdvdcss_changes.diff Wed Sep 13 13:36:49 2006 +0000 @@ -12,28 +12,8 @@ # if !defined( _OFF_T_ ) typedef long long _off_t; typedef _off_t off_t; ---- css.c 2005-07-11 14:24:09.000000000 +0200 -+++ css.c 2005-10-01 20:14:37.000000000 +0200 -@@ -53,7 +56,7 @@ - # include <limits.h> - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" --- device.c 2005-07-11 13:33:34.000000000 +0200 +++ device.c 2005-10-01 19:08:07.000000000 +0200 -@@ -55,7 +44,7 @@ - # include <sys/uio.h> /* struct iovec */ - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" @@ -143,8 +132,11 @@ print_debug( dvdcss, "opening target `%s'", psz_device ); @@ -48,28 +28,8 @@ /* Initialize readv temporary buffer */ dvdcss->p_readv_buffer = NULL; ---- error.c 2004-02-24 16:46:49.000000000 +0100 -+++ error.c 2005-10-01 20:15:46.000000000 +0200 -@@ -34,7 +37,7 @@ - # include <limits.h> - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" --- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200 +++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200 -@@ -124,7 +127,7 @@ - # include <direct.h> - #endif - --#include "dvdcss/dvdcss.h" -+#include "dvdcss.h" - - #include "common.h" - #include "css.h" @@ -301,6 +301,10 @@ { psz_home = getenv( "HOME" );
--- a/libmpdvdkit2/libdvdread_changes.diff Wed Sep 13 13:19:20 2006 +0000 +++ b/libmpdvdkit2/libdvdread_changes.diff Wed Sep 13 13:36:49 2006 +0000 @@ -78,7 +78,7 @@ #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ -#include <dvdcss/dvdcss.h> -+#include "dvdcss.h" ++#include "dvdcss/dvdcss.h" #define DVDcss_open(a) dvdcss_open((char*)(a)) #define DVDcss_close dvdcss_close #define DVDcss_seek dvdcss_seek