April 2007 - DVDnav-discuss - lists.mplayerhq.hu

r912 - trunk/libdvdnav2/src/searching.c
by nicodvb 29 Apr '07

29 Apr '07

Author: nicodvb Date: Sun Apr 29 13:20:37 2007 New Revision: 912 Log: in dvdnav_time_search() skip secondary angles when searching the cell to jump to Modified: trunk/libdvdnav2/src/searching.c Modified: trunk/libdvdnav2/src/searching.c ============================================================================== --- trunk/libdvdnav2/src/searching.c (original) +++ trunk/libdvdnav2/src/searching.c Sun Apr 29 13:20:37 2007 @@ -181,6 +181,8 @@ dvdnav_status_t dvdnav_sector_search(dvd found = 0; for(cell_nr = first_cell_nr; (cell_nr <= last_cell_nr) && !found; cell_nr ++) { cell = &(state->pgc->cell_playback[cell_nr-1]); + if(cell->block_type == BLOCK_TYPE_ANGLE_BLOCK && cell->block_mode != BLOCK_MODE_FIRST_CELL) + continue; length = cell->last_sector - cell->first_sector + 1; if (target >= length) { target -= length;

1 0

r911 - trunk/libdvdnav/Makefile
by nicodvb 28 Apr '07

28 Apr '07

Author: nicodvb Date: Sat Apr 28 11:35:45 2007 New Revision: 911 Log: fix broken dependencies in dvdnav-config* targets Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Sat Apr 28 11:35:45 2007 @@ -128,7 +128,7 @@ distclean: clean find . -name "*~" | xargs rm -rf rm -rf config.mak -dvdnav-config: +dvdnav-config: $(.OBJDIR) echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config @@ -137,7 +137,7 @@ dvdnav-config: cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config -install-dvdnav-config: +install-dvdnav-config: dvdnav-config install -d $(PREFIX)/bin install -m 0755 $(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config

1 0

r910 - in trunk/libdvdnav: misc/dvdnav-config2.sh src/dvdnav.h
by nicodvb 28 Apr '07

28 Apr '07

Author: nicodvb Date: Sat Apr 28 11:27:27 2007 New Revision: 910 Log: when compiling against external dvdread add a compile time macro to identify the case (by means of dvdnav-config --cflags) and include the correct headers in dvdnav.h Modified: trunk/libdvdnav/misc/dvdnav-config2.sh trunk/libdvdnav/src/dvdnav.h Modified: trunk/libdvdnav/misc/dvdnav-config2.sh ============================================================================== --- trunk/libdvdnav/misc/dvdnav-config2.sh (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Sat Apr 28 11:27:27 2007 @@ -2,6 +2,7 @@ if test "$dvdread" = "external"; then dvdreadlib="-ldvdread" dvdreadmsg="[--minilibs --minicflags]" dvdreadcflags="-I$dvdreaddir" + extracflags="-DDVDNAV_USES_EXTERNAL_DVDREAD" fi usage() @@ -67,11 +68,11 @@ if test "$echo_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I$prefix/include -I$prefix/include/dvdnav $dvdreadcflags $threadcflags + echo -I$prefix/include -I$prefix/include/dvdnav $dvdreadcflags $extracflags $threadcflags fi if test "$echo_minicflags" = "yes"; then - echo -I$prefix/include -I$prefix/include/dvdnav $threadcflags + echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags fi if test "$echo_libs" = "yes"; then Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Sat Apr 28 11:27:27 2007 @@ -37,9 +37,15 @@ extern "C" { #ifndef DVDNAV_COMPILE # include <dvdnav/dvd_types.h> +#ifdef DVDNAV_USES_EXTERNAL_DVDREAD +# include <dvdread/dvd_reader.h> +# include <dvdread/nav_types.h> +# include <dvdread/ifo_types.h> /* For vm_cmd_t */ +#else # include <dvdnav/dvd_reader.h> # include <dvdnav/nav_types.h> # include <dvdnav/ifo_types.h> /* For vm_cmd_t */ +#endif # include <dvdnav/dvdnav_events.h> #endif

1 0

[propchange]: r909 - svn:log
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Revision: 909 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ when using external dvdread add to cflags the appropriate -I, -but not when --cflags is specified +but not when --minicflags is specified

1 0

r909 - in trunk/libdvdnav: Makefile misc/dvdnav-config2.sh
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Date: Wed Apr 25 22:21:30 2007 New Revision: 909 Log: when using external dvdread add to cflags the appropriate -I, but not when --cflags is specified Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/misc/dvdnav-config2.sh Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 25 22:21:30 2007 @@ -132,6 +132,7 @@ dvdnav-config: echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config + echo -e 'dvdreaddir='$(DVDREAD_DIR)'\n' >> $(.OBJDIR)/dvdnav-config echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(.OBJDIR)/dvdnav-config cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config Modified: trunk/libdvdnav/misc/dvdnav-config2.sh ============================================================================== --- trunk/libdvdnav/misc/dvdnav-config2.sh (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Wed Apr 25 22:21:30 2007 @@ -1,6 +1,7 @@ if test "$dvdread" = "external"; then dvdreadlib="-ldvdread" - dvdreadmsg="[--minilibs]" + dvdreadmsg="[--minilibs --minicflags]" + dvdreadcflags="-I$dvdreaddir" fi usage() @@ -37,6 +38,13 @@ while test $# -gt 0; do --cflags) echo_cflags=yes ;; + --minicflags) + if test "$dvdread" = "external"; then + echo_minicflags=yes + else + usage 1 1>&2 + fi + ;; --libs) echo_libs=yes ;; @@ -59,6 +67,10 @@ if test "$echo_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then + echo -I$prefix/include -I$prefix/include/dvdnav $dvdreadcflags $threadcflags +fi + +if test "$echo_minicflags" = "yes"; then echo -I$prefix/include -I$prefix/include/dvdnav $threadcflags fi

1 0

r908 - trunk/libdvdnav/misc/dvdnav-config2.sh
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Date: Wed Apr 25 21:45:21 2007 New Revision: 908 Log: 10l, forgotten to add /include to -I Modified: trunk/libdvdnav/misc/dvdnav-config2.sh Modified: trunk/libdvdnav/misc/dvdnav-config2.sh ============================================================================== --- trunk/libdvdnav/misc/dvdnav-config2.sh (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Wed Apr 25 21:45:21 2007 @@ -59,7 +59,7 @@ if test "$echo_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I$prefix -I$prefix/dvdnav $threadcflags + echo -I$prefix/include -I$prefix/include/dvdnav $threadcflags fi if test "$echo_libs" = "yes"; then

1 0

r907 - trunk/libdvdnav/misc/dvdnav-config2.sh
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Date: Wed Apr 25 21:41:01 2007 New Revision: 907 Log: 10l, forgotten to add /lib to -L Modified: trunk/libdvdnav/misc/dvdnav-config2.sh Modified: trunk/libdvdnav/misc/dvdnav-config2.sh ============================================================================== --- trunk/libdvdnav/misc/dvdnav-config2.sh (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Wed Apr 25 21:41:01 2007 @@ -63,9 +63,9 @@ if test "$echo_cflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - echo -L$prefix -ldvdnav $dvdreadlib $threadlib + echo -L$prefix/lib -ldvdnav $dvdreadlib $threadlib fi if test "$echo_minilibs" = "yes"; then - echo -L$prefix -ldvdnav $threadlib + echo -L$prefix/lib -ldvdnav $threadlib fi

1 0

r906 - trunk/libdvdnav/Makefile
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Date: Wed Apr 25 21:35:28 2007 New Revision: 906 Log: create bin directory for installation of dvdnav-config Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 25 21:35:28 2007 @@ -137,6 +137,7 @@ dvdnav-config: chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config install-dvdnav-config: + install -d $(PREFIX)/bin install -m 0755 $(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config

1 0

r905 - in trunk/libdvdnav: Makefile misc/dvdnav-config2.sh
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Date: Wed Apr 25 21:26:34 2007 New Revision: 905 Log: added appropriate flags to dvdnav-config to handle --minilibs (to be used when dvdread is external) Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/misc/dvdnav-config2.sh Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 25 21:26:34 2007 @@ -131,6 +131,7 @@ distclean: clean dvdnav-config: echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config + echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(.OBJDIR)/dvdnav-config cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config Modified: trunk/libdvdnav/misc/dvdnav-config2.sh ============================================================================== --- trunk/libdvdnav/misc/dvdnav-config2.sh (original) +++ trunk/libdvdnav/misc/dvdnav-config2.sh Wed Apr 25 21:26:34 2007 @@ -1,3 +1,7 @@ +if test "$dvdread" = "external"; then + dvdreadlib="-ldvdread" + dvdreadmsg="[--minilibs]" +fi usage() { @@ -8,6 +12,7 @@ Options: [--version] [--libs] [--cflags] + $dvdreadmsg EOF exit $1 } @@ -35,6 +40,13 @@ while test $# -gt 0; do --libs) echo_libs=yes ;; + --minilibs) + if test "$dvdread" = "external"; then + echo_minilibs=yes + else + usage 1 1>&2 + fi + ;; *) usage 1 1>&2 ;; @@ -51,5 +63,9 @@ if test "$echo_cflags" = "yes"; then fi if test "$echo_libs" = "yes"; then - echo -L$prefix -ldvdnav $threadlib + echo -L$prefix -ldvdnav $dvdreadlib $threadlib fi + +if test "$echo_minilibs" = "yes"; then + echo -L$prefix -ldvdnav $threadlib +fi

1 0

r904 - trunk/libdvdnav/Makefile
by nicodvb 25 Apr '07

25 Apr '07

Author: nicodvb Date: Wed Apr 25 20:19:31 2007 New Revision: 904 Log: fixed dvdnav-config* targets for buildir .ne. srcdir Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 25 20:19:31 2007 @@ -129,14 +129,14 @@ distclean: clean rm -rf config.mak dvdnav-config: - echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config - echo -e 'version='$(SHLIB_VERSION)'\n' >> $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config - echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config - cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config + echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config + echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(.OBJDIR)/dvdnav-config + cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config install-dvdnav-config: - install -m 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config + install -m 0755 $(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config vpath %.so ${.OBJDIR}

1 0