Update of /cvsroot/mplayer/main/libmpdvdkit In directory mail:/var/tmp.root/cvs-serv21862/libmpdvdkit Modified Files: ioctl.c Added Files: darwin_dvdioctl.h Log Message: Darwin/Mac OS X dvd support. Patch from Joey Parrish <joey@yunamusic.com> --- NEW FILE --- /***************************************************************************** * DVDioctl.h: Linux-like DVD driver for Darwin and MacOS X ***************************************************************************** * Copyright (C) 2001 VideoLAN * $Id: darwin_dvdioctl.h,v 1.1 2002/06/13 22:39:50 atmos4 Exp $ * * Authors: Samuel Hocevar <sam@zoy.org> * Eugenio Jarosiewicz <ej0@cise.ufl.edu> * * The contents of this file constitute Original Code as defined in and * are subject to the Apple Public Source License Version 1.1 (the * "License"). You may not use this file except in compliance with the * License. Please obtain a copy of the License at * http://www.apple.com/publicsource and read it before using this file. * * This Original Code and all software distributed under the License are * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the * License for the specific language governing rights and limitations * under the License. *****************************************************************************/ #if defined(KERNEL) /* Everything has already been defined */ #else enum DVDKeyFormat { kCSSAGID = 0x00, kChallengeKey = 0x01, kKey1 = 0x02, kKey2 = 0x03, kTitleKey = 0x04, kASF = 0x05, kSetRegion = 0x06, kRPCState = 0x08, kCSS2AGID = 0x10, kCPRMAGID = 0x11, kInvalidateAGID = 0x3f }; enum DVDKeyClass { kCSS_CSS2_CPRM = 0x00, kRSSA = 0x01 }; #endif typedef struct dvdioctl_data { void *p_buffer; #if defined(KERNEL) UInt32 i_size; UInt32 i_lba; UInt8 i_agid; #else u32 i_size; u32 i_lba; u8 i_agid; #endif int i_keyclass; int i_keyformat; } dvdioctl_data_t; #define IODVD_READ_STRUCTURE _IOWR('B', 1, dvdioctl_data_t) #define IODVD_SEND_KEY _IOWR('B', 2, dvdioctl_data_t) #define IODVD_REPORT_KEY _IOWR('B', 3, dvdioctl_data_t) Index: ioctl.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdvdkit/ioctl.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ioctl.c 9 May 2002 09:06:44 -0000 1.2 +++ ioctl.c 13 Jun 2002 22:39:50 -0000 1.3 @@ -70,7 +70,7 @@ #include "common.h" #ifdef SYS_DARWIN -# include "MacOSX_dvdioctl/DVDioctl.h" +# include "darwin_dvdioctl.h" #endif #include "ioctl.h"