From 1fad422fafc3eb388da137e01793455308699d35 Mon Sep 17 00:00:00 2001 From: James Courtier-Dutton Date: Tue, 29 Apr 2003 18:57:28 +0000 Subject: More syncing from libdvdnav at dvd.sf.net CVS patchset: 4710 CVS date: 2003/04/29 18:57:28 --- src/input/libdvdnav/dvdnav.c | 233 +------------------------------------------ 1 file changed, 1 insertion(+), 232 deletions(-) diff --git a/src/input/libdvdnav/dvdnav.c b/src/input/libdvdnav/dvdnav.c index 6b4609a14..78752b4d4 100644 --- a/src/input/libdvdnav/dvdnav.c +++ b/src/input/libdvdnav/dvdnav.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: dvdnav.c,v 1.24 2003/04/07 18:10:47 mroi Exp $ + * $Id: dvdnav.c,v 1.25 2003/04/29 18:57:28 jcdutton Exp $ * */ @@ -1088,234 +1088,3 @@ uint32_t dvdnav_get_next_still_flag(dvdnav_t *this) { return this->position_next.still; } -/* - * $Log: dvdnav.c,v $ - * Revision 1.24 2003/04/07 18:10:47 mroi - * merging libdvdnav, since some nice fixes took place - * - * Revision 1.23 2003/04/06 13:09:38 mroi - * report start of PG as well - * - * Revision 1.22 2003/04/05 12:28:16 miguelfreitas - * "perfect" time display for dvds - * (see thread on xine-devel for details) - * - * Revision 1.21 2003/04/01 09:02:43 jcdutton - * Get libdvdnav to build in DEBUG and TRACE mode. - * - * Revision 1.20 2003/03/27 13:46:47 mroi - * sync to libdvdnav cvs - * * fix conversion of dvd_time_t (I do know BCD, I just did it wrong...) - * - * Revision 1.19 2003/03/25 13:17:20 mroi - * sync to cvs of libdvdnav - * * optional PGC based seeking - * * new event on cell changes for timing info (currently not used by xine-lib) - * - * Revision 1.18 2003/03/21 22:13:37 mroi - * sync to libdvdnav cvs - * * method to try-run VM operations, now used for safer chapter skipping and menu jumps - * * fixed detection of current PTT to not assume a 1:1 mapping between PTTs and PGs - * * releasing stills when jumping to menu fixes some state inconsistencies - * * do not assume PGs to be physically layed out in sequence on the disc - * - * Revision 1.17 2003/02/26 20:44:12 mroi - * sync to current libdvdnav cvs, important change is the new DVDNAV_WAIT event, - * which allows us to keep libdvdnav and what is seen on screen in sync in certain - * critical situations (otherwise libdvdnav is always ahead by the fifo length) - * - * Revision 1.15 2003/02/24 18:31:15 mroi - * sorry, wrong commit, this time it is: fix seek detection - * - * Revision 1.14 2003/02/24 18:19:27 mroi - * fix seek detection - * - * Revision 1.13 2003/02/20 16:01:58 mroi - * syncing to libdvdnav 0.1.5 and modifying input plugin accordingly - * quoting the ChangeLog: - * * some bugfixes - * * code cleanup - * * build process polishing - * * more sensible event order in get_next_block to ensure useful event delivery - * * VOBU level resume - * * fixed: seeking in a multiangle feature briefly showed the wrong angle - * - * Revision 1.12 2003/01/29 02:02:03 miguelfreitas - * avoid segfault - * - * Revision 1.11 2003/01/27 21:02:42 mroi - * temporary fix for segfaulting DVDs - * libdvdnav cleanup needed (will start tomorrow) - * - * Revision 1.10 2002/10/22 17:18:23 jkeil - * Recursive comments, picked up via CVS $Log keyword. Trying to fix... - * - * Revision 1.9 2002/10/22 04:39:01 storri - * Changed comments to standard / * ... * / - * - * Revision 1.8 2002/09/20 12:53:53 mroi - * sync to latest libdvdnav cvs version - * - * Revision 1.7 2002/09/04 11:07:47 mroi - * sync to libdvdnav cvs - * - * Revision 1.6 2002/08/31 02:48:13 jcdutton - * Add a printf so we can tell if a user is using xine's libdvdnav or the one from - * dvd.sf.net. - * Add some "this->dvdnav = NULL;" after dvdnav_close() - * - * Revision 1.5 2002/08/27 19:24:33 mroi - * sync to libdvdnav cvs, this should now conform to the way xine outputs - * its console messages (write to stdout, "libdvdnav: " in front each line) - * - * Revision 1.4 2002/08/19 17:17:00 mroi - * sync to libdvdnav cvs - * - update clut and spu/audio channel more often - * - align read cache in memory to allow use of raw devices - * - * Revision 1.3 2002/08/09 22:52:14 mroi - * change includes from system include to local include where the file is in - * our tree now to avoid version clashes - * - * Revision 1.2 2002/08/08 21:55:54 richwareham - * Changed loads of #include to #include <...> - * - * Revision 1.1 2002/08/08 17:49:21 richwareham - * First stage of DVD plugin -> dvdnav conversion - * - * Revision 1.29 2002/07/25 14:51:40 richwareham - * Moved get_current_nav_pci into dvdnac.c, changed example to use it instead of 'home-rolled' - * check_packet. - * - * Revision 1.28 2002/07/25 14:42:33 richwareham - * Patch from aschultz@cs.uni-magdeburg.de to allow for still-frame 'peek-ahead' - * - * Revision 1.27 2002/07/12 15:46:44 mroi - * use new memcopy'less read ahead cache - * - * Revision 1.26 2002/07/06 16:24:54 mroi - * * fix debug messages - * * send spu stream change event only, when there are new streams - * (should fix problems with Terminator disk 2) - * - * Revision 1.25 2002/07/05 14:18:54 mroi - * report all spu types (widescreen, letterbox and pan&scan), not widescreen - * only and report the stream's scale permissions to detect pan&scan material - * - * Revision 1.24 2002/07/05 01:42:30 jcdutton - * Add more debug info for Menu language selection. - * Only do vm_start when we have to. - * - * Revision 1.23 2002/07/02 22:57:09 jcdutton - * Rename some of the functions in vm.c to help readability. - * Hopefully fix __FUNCTION__ problem. Use __func_ as recommended in C99. - * Fix bug where libdvdnav would not immeadiately replay the same cell due to menu buttons. - * - * Revision 1.22 2002/06/25 13:37:11 jcdutton - * Revert back to old read_cache method. - * Some new optimizations added to the old read_cache method, thus reducing the amount of calls to read blocks from the DVD device. - * - * Revision 1.21 2002/06/06 15:03:09 richwareham - * Biiiiiiig change to let doxygen generate some docs for the library. Note that I'm in no way sure that the autoconf stuff plays nice. - * - * Revision 1.20 2002/06/04 13:35:16 richwareham - * Removed more C++ style comments - * - * Revision 1.19 2002/05/30 23:15:14 richwareham - * First draft of removing HAVE_DVDREAD9 - * - * Revision 1.18 2002/05/30 09:52:29 richwareham - * 'Objectified' the read-ahead cache in preparation to implement a 'proper' threaded cache a-la that recommended in the DVD Demystified book. - * - * Revision 1.17 2002/05/09 11:57:24 richwareham - * Angles now work (still a few wrinkles though -- e.g. angle does not reset to '1' when returning to menus) - * - * Revision 1.16 2002/04/24 21:15:25 jcdutton - * Quiet please!!! - * - * Revision 1.15 2002/04/24 00:47:46 jcdutton - * Some more cleanups. - * Improve button passing. - * - * Revision 1.14 2002/04/23 13:26:08 jcdutton - * Add some comments, FIXMEs. - * The main point being that dvdnav_get_next_block is almost in a state where it can be optional whether the application programmer uses it, or implements their own version of the function. That is been the main reason for the re-write of this function recently. - * - * Revision 1.13 2002/04/23 12:55:40 jcdutton - * Removed un-needed variables. - * General Clean up. - * - * Revision 1.12 2002/04/23 12:34:39 f1rmb - * Why rewrite vm function, use it instead (this remark is for me, of course ;-) ). - * Comment unused var, shut compiler warnings. - * - * Revision 1.11 2002/04/23 02:12:27 jcdutton - * Re-implemented seeking. - * - * Revision 1.10 2002/04/23 00:07:16 jcdutton - * Name stills work better. - * - * Revision 1.9 2002/04/22 22:00:48 jcdutton - * Start of rewrite of libdvdnav. Still need to re-implement seeking. - * - * Revision 1.8 2002/04/22 20:57:14 f1rmb - * Change/fix SPU active stream id. Same for audio. Few new functions, largely - * inspired from libogle ;-). - * - * Revision 1.7 2002/04/10 16:45:57 jcdutton - * Actually fix the const this time! - * - * Revision 1.6 2002/04/07 14:10:11 richwareham - * Stop C++ bitching about some things and extend the menus example - * - * Revision 1.5 2002/04/06 18:42:05 jcdutton - * Slight correction to handle quicker menu transitions. - * - * Revision 1.4 2002/04/06 18:31:50 jcdutton - * Some cleaning up. - * changed exit(1) to assert(0) so they actually get seen by the user so that it helps developers more. - * - * Revision 1.3 2002/04/02 18:22:27 richwareham - * Added reset patch from Kees Cook - * - * Revision 1.2 2002/04/01 18:56:28 richwareham - * Added initial example programs directory and make sure all debug/error output goes to stderr. - * - * Revision 1.1.1.1 2002/03/12 19:45:57 richwareham - * Initial import - * - * Revision 1.28 2002/02/02 23:26:20 richwareham - * Restored title selection - * - * Revision 1.27 2002/02/01 15:48:10 richwareham - * Re-implemented angle selection and title/chapter display - * - * Revision 1.26 2002/01/31 16:53:49 richwareham - * Big patch from Daniel Caujolle-Bert to (re)implement SPU/Audio language display - * - * Revision 1.25 2002/01/24 20:53:50 richwareham - * Added option to _not_ use DVD read-ahead to options - * - * Revision 1.24 2002/01/20 15:54:59 jcdutton - * Implement seeking. - * It is still a bit buggy, but works sometimes. - * I need to find out how to make the jump clean. - * At the moment, some corruption of the mpeg2 stream occurs, - * which causes libmpeg2 to crash. - * - * Revision 1.23 2002/01/18 00:23:52 jcdutton - * Support Ejecting of DVD. - * It will first un-mount the DVD, then eject it. - * - * Revision 1.22 2002/01/17 14:50:32 jcdutton - * Fix corruption of stream during menu transitions. - * Menu transitions are now clean. - * - * Revision 1.21 2002/01/15 00:37:03 jcdutton - * Just a few cleanups, and a assert fix. (memset fixed it) - * - * Revision 1.20 2002/01/13 22:17:57 jcdutton - * Change logging. - * - * - */ -- cgit v1.2.3