summaryrefslogtreecommitdiff
path: root/src/input/libdvdnav/diff_against_cvs.patch
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2003-02-20 16:01:57 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2003-02-20 16:01:57 +0000
commit721f6f8e151e4911252d7a300870a001737d991e (patch)
treedcbc447ca9812d0b0411040ba2136d34ca9cc003 /src/input/libdvdnav/diff_against_cvs.patch
parent6f52999d1c37f9a90655a7adbdeb782e87beac14 (diff)
downloadxine-lib-721f6f8e151e4911252d7a300870a001737d991e.tar.gz
xine-lib-721f6f8e151e4911252d7a300870a001737d991e.tar.bz2
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 CVS patchset: 4217 CVS date: 2003/02/20 16:01:57
Diffstat (limited to 'src/input/libdvdnav/diff_against_cvs.patch')
-rw-r--r--src/input/libdvdnav/diff_against_cvs.patch35
1 files changed, 15 insertions, 20 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch
index c07584634..e7c3ae9d5 100644
--- a/src/input/libdvdnav/diff_against_cvs.patch
+++ b/src/input/libdvdnav/diff_against_cvs.patch
@@ -18,16 +18,11 @@
-#include <dvdread/ifo_types.h> /* vm_cmd_t */
+#include "ifo_types.h" /* vm_cmd_t */
- /* Uncomment for tracing */
- /* #define TRACE */
+ /* link command types */
+ typedef enum {
--- src/input/libdvdnav/dvdnav.c Wed Sep 4 12:50:34 2002
+++ src/input/libdvdnav/dvdnav.c Wed Sep 4 12:50:42 2002
-@@ -30,11 +30,11 @@
- */
-
- #include <pthread.h>
--#include <dvdnav.h>
-+#include "dvdnav.h"
+@@ -33,7 +33,7 @@
#include "dvdnav_internal.h"
#include "read_cache.h"
@@ -36,7 +31,7 @@
#include <stdlib.h>
#include <stdio.h>
-@@ -183,7 +183,7 @@
+@@ -68,7 +68,7 @@
struct timeval time;
/* Create a new structure */
@@ -92,17 +87,22 @@
+#include "ifo_types.h"
- /* Maximum length of an error string */
+ /* Uncomment for VM command tracing */
--- src/input/libdvdnav/highlight.c Wed Sep 4 12:50:34 2002
+++ src/input/libdvdnav/highlight.c Wed Sep 4 12:55:44 2002
-@@ -34,10 +34,10 @@
+@@ -30,7 +30,7 @@
#include "dvdnav_internal.h"
#include "vm.h"
-#include <dvdread/nav_types.h>
+#include "nav_types.h"
+ /*
+ #define BUTTON_TESTING
+@@ -38,7 +38,7 @@
+
#ifdef BUTTON_TESTING
+
-#include <dvdread/nav_print.h>
+#include "nav_print.h"
#include "vmcmd.h"
@@ -110,20 +110,15 @@
static void print_time(dvd_time_t *dtime) {
--- src/input/libdvdnav/searching.c Fri Jul 26 12:58:10 2002
+++ src/input/libdvdnav/searching.c Fri Aug 9 22:03:20 2002
-@@ -25,11 +25,11 @@
- #include "config.h"
- #endif
-
--#include <dvdnav.h>
-+#include "dvdnav.h"
+@@ -30,7 +30,7 @@
#include "dvdnav_internal.h"
#include "vm.h"
-#include <dvdread/nav_types.h>
+#include "nav_types.h"
- /* Searching API calls */
-
+ /*
+ #define LOG_DEBUG
--- src/input/libdvdnav/vm.c Sat Jul 6 18:12:09 2002
+++ src/input/libdvdnav/vm.c Fri Aug 9 22:03:48 2002
@@ -37,8 +37,8 @@
@@ -147,4 +142,4 @@
+#include "ifo_types.h" /* Only for vm_cmd_t */
#include "decoder.h"
- void vmPrint_mnemonic(vm_cmd_t *command);
+ #ifdef TRACE