Permalink
Browse files

added dvdread

backport of mpeg extraction form k9copy 2.x.x

git-svn-id: https://k9copy.svn.sourceforge.net/svnroot/k9copy/trunk@304 250c61c0-cc0d-0410-af45-d4f8fccfe43b
  • Loading branch information...
jnmchlptt
jnmchlptt committed Oct 26, 2008
1 parent c46969c commit f6f0df1ef06401f19b3aa00bd2b723fbc053f2c1
Showing with 2,191 additions and 4,695 deletions.
  1. +4 −3 Makefile.am
  2. +30 −55 Makefile.in
  3. +313 −994 acinclude.m4
  4. +11 −33 config.h.in
  5. +845 −2,502 configure
  6. +10 −52 configure.in
  7. +5 −3 configure.in.in
  8. +6 −17 doc/Makefile.in
  9. +12 −23 doc/k9copy/Makefile.in
  10. +1 −1 k9Mplayer/Makefile.am
  11. +2 −2 k9author/Makefile.am
  12. +7 −0 k9author/k9avidecode.cpp
  13. +7 −0 k9author/k9avidecode.h
  14. +2 −2 k9decmpeg/Makefile.am
  15. +8 −19 k9decmpeg/Makefile.in
  16. +2 −2 k9devices/Makefile.am
  17. +16 −27 k9devices/Makefile.in
  18. +2 −1 k9vamps/Makefile.am
  19. +10 −19 k9vamps/Makefile.in
  20. +3 −2 libdvdnav/Makefile.am
  21. +12 −23 libdvdnav/Makefile.in
  22. +5 −6 libdvdnav/common.h
  23. +7 −7 libdvdnav/dvdnav.c
  24. +0 −74 libdvdnav/dvdread.c
  25. +0 −107 libdvdnav/dvdread.h
  26. +2 −2 libdvdnav/read_cache.c
  27. +20 −20 libdvdnav/vm.c
  28. +2 −2 libk9copy/Makefile.am
  29. +50 −66 libk9copy/Makefile.in
  30. +5 −6 libk9copy/k9common.h
  31. +20 −14 libk9copy/k9dvdbackup.cpp
  32. +9 −9 libk9copy/k9dvdread.cpp
  33. +3 −3 libk9copy/k9ifo2.cpp
  34. +495 −372 libk9copy/k9mp4enc.cpp
  35. +7 −0 libk9copy/k9mp4enc.h
  36. +2 −2 libk9copy/k9script.cpp
  37. +62 −77 po/Makefile.in
  38. +7 −6 src/Makefile.am
  39. +116 −137 src/Makefile.in
  40. BIN src/icons/hi16-action-mpeg.png
  41. BIN src/icons/hi22-action-mpeg.png
  42. BIN src/icons/hi32-action-mpeg.png
  43. BIN src/icons/hi48-action-mpeg.png
  44. +12 −0 src/k9copy.cpp
  45. +2 −0 src/k9copy.h
  46. +3 −1 src/k9copyui.rc
  47. +50 −0 src/k9main.cpp
  48. +1 −0 src/k9main.h
  49. +1 −1 src/k9play.cpp
  50. +1 −3 src/main.cpp
  51. +1 −0 subdirs
View
@@ -1,5 +1,5 @@
-SUBDIRS = doc k9decmpeg k9devices k9vamps libdvdnav libk9copy k9Mplayer \
- k9author po src
+SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
+ po src
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
@@ -27,7 +27,7 @@ dist-hook:
cd $(top_distdir) && perl admin/am_edit -padmin
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-AM_CXXFLAGS = -O3 -g3
+AM_CXXFLAGS = -O0 -g3
@@ -36,3 +36,4 @@ AM_CXXFLAGS = -O3 -g3
+INCLUDES = -I$(top_srcdir)/dvdread
View
@@ -1,5 +1,5 @@
# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 483858 $
+# KDE tags expanded automatically by am_edit - $Revision: 1.5.4.1 $
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37,9 +37,9 @@ subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- TODO admin/compile admin/config.guess admin/config.sub \
- admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
- admin/mkinstalldirs admin/ylwrap
+ TODO admin/ChangeLog admin/compile admin/config.guess \
+ admin/config.sub admin/depcomp admin/install-sh \
+ admin/ltmain.sh admin/missing admin/mkinstalldirs admin/ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.in
@@ -118,7 +118,6 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
@@ -128,7 +127,6 @@ GREP = @GREP@
HAL_DBUS_LIBS = @HAL_DBUS_LIBS@
HAL_INCS = @HAL_INCS@
HAL_LIBS = @HAL_LIBS@
-HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -138,7 +136,6 @@ K3B_LIBS = @K3B_LIBS@
KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
KCONFIG_COMPILER = @KCONFIG_COMPILER@
KDECONFIG = @KDECONFIG@
-KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@
KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
KDE_INCLUDES = @KDE_INCLUDES@
KDE_LDFLAGS = @KDE_LDFLAGS@
@@ -151,14 +148,10 @@ KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_FPIE = @KDE_USE_FPIE@
KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_USE_PIE = @KDE_USE_PIE@
KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
LDFLAGS = @LDFLAGS@
-LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@
-LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@
LIBCOMPAT = @LIBCOMPAT@
LIBCRYPT = @LIBCRYPT@
LIBDL = @LIBDL@
@@ -177,22 +170,16 @@ LIBZ = @LIBZ@
LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@
LIB_KDECORE = @LIB_KDECORE@
-LIB_KDED = @LIB_KDED@
LIB_KDEPIM = @LIB_KDEPIM@
LIB_KDEPRINT = @LIB_KDEPRINT@
LIB_KDEUI = @LIB_KDEUI@
-LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
-LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@
-LIB_KJS = @LIB_KJS@
-LIB_KNEWSTUFF = @LIB_KNEWSTUFF@
LIB_KPARTS = @LIB_KPARTS@
LIB_KSPELL = @LIB_KSPELL@
LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUNITTEST = @LIB_KUNITTEST@
LIB_KUTILS = @LIB_KUTILS@
LIB_POLL = @LIB_POLL@
LIB_QPE = @LIB_QPE@
@@ -204,7 +191,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -221,7 +207,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
QTE_NORTTI = @QTE_NORTTI@
QT_INCLUDES = @QT_INCLUDES@
QT_LDFLAGS = @QT_LDFLAGS@
@@ -334,12 +319,13 @@ x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
-SUBDIRS = doc k9decmpeg k9devices k9vamps libdvdnav libk9copy k9Mplayer \
- k9author po src
+SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \
+ po src
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
EXTRA_DIST = admin COPYING configure.in.in
-AM_CXXFLAGS = -O3 -g3
+AM_CXXFLAGS = -O0 -g3
+INCLUDES = -I$(top_srcdir)/dvdread
#>- all: config.h
#>+ 1
all: docs-am config.h
@@ -361,14 +347,13 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
#>- cd $(top_srcdir) && \
#>- $(AUTOMAKE) --gnu Makefile
-#>+ 14
+#>+ 13
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- ( \
cd $(srcdir) && $(AUTOMAKE) --gnu \
- ) || exit 1; echo ' cd $(top_srcdir) && perl admin/am_edit '; cd $(top_srcdir) && perl admin/am_edit && exit 0; \
+ && exit 0; \
exit 1;; \
esac; \
done; \
@@ -392,9 +377,8 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC
$(top_srcdir)/configure: $(am__configure_deps)
#>- cd $(srcdir) && $(AUTOCONF)
-#>+ 2
- cd $(srcdir) && rm -f configure
- cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
+#>+ 1
+ cd $(srcdir) && rm -f configure && $(MAKE) -f admin/Makefile.common configure
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
@@ -842,39 +826,26 @@ dist-hook:
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-clean-bcheck:
- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
- @for i in ; do \
- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
- echo "$$i"; \
- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
- rm -f $$i.bchecktest.cc; exit 1; \
- fi ; \
- echo "" >> $$i.bchecktest.cc.class; \
- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
- rm -f a.out; \
- fi ; \
- done
-
-
-
#>+ 2
-KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in k9copy-1.2.3.tar.gz k9copy.kdevelop.spec configure.in Makefile.cvs k9copy.kdevses aclocal.m4 Doxyfile k9copy.kdevelop.pcs configure Makefile.am acinclude.m4 k9copy.kdevelop
+KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in Makefile.cvs k9copy.kdevses aclocal.m4 Doxyfile k9copy.kdevelop.pcs acinclude.m4 configure Makefile.am k9copy.kdevelop
#>+ 2
docs-am:
-#>+ 7
+#>+ 16
force-reedit:
- \
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
cd $(srcdir) && $(AUTOMAKE) --gnu \
-
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
cd $(top_srcdir) && perl admin/am_edit Makefile.in
@@ -890,7 +861,7 @@ bcheck-am:
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
- if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS) --dump-class-hierarchy $$i.bchecktest.cc; then \
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
@@ -916,6 +887,10 @@ no-final:
no-final-install:
$(MAKE) install-am
+#>+ 3
+cvs-clean:
+ $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
+
#>+ 3
kde-rpo-clean:
-rm -f *.rpo
Oops, something went wrong.

0 comments on commit f6f0df1

Please sign in to comment.