Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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...
commit f6f0df1ef06401f19b3aa00bd2b723fbc053f2c1 1 parent c46969c
jnmchlptt authored
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
7 Makefile.am
@@ -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
85 Makefile.in
@@ -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; \
@@ -917,6 +888,10 @@ 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
View
1,307 acinclude.m4
313 additions, 994 deletions not shown
View
44 config.h.in
@@ -12,9 +12,6 @@
/* HAL API version 0.4 */
#undef HAL_0_4
-/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-#undef HAVE_CARBON_CARBON_H
-
/* Define if you have the CoreAudio API */
#undef HAVE_COREAUDIO
@@ -27,9 +24,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define to 1 if you have the <dvdread/dvd_reader.h> header file. */
-#undef HAVE_DVDREAD_DVD_READER_H
-
/* compile in HAL support */
#undef HAVE_HAL
@@ -57,12 +51,9 @@
/* openGL support */
#undef HAVE_OPENGL
-/* Define if you have res_init */
+/* Define if you have the res_init function */
#undef HAVE_RES_INIT
-/* Define if you have the res_init prototype */
-#undef HAVE_RES_INIT_PROTO
-
/* Define if you have a STL implementation by SGI */
#undef HAVE_SGI_STL
@@ -93,9 +84,6 @@
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
@@ -114,9 +102,15 @@
/* Define a safe value for MAXPATHLEN */
#undef KDEMAXPATHLEN
+/* new ffmpeg */
+#undef NEW_FFMPEG
+
/* No openGL support */
#undef NO_OPENGL
+/* old ffmpeg */
+#undef OLD_FFMPEG
+
/* Name of package */
#undef PACKAGE
@@ -159,9 +153,6 @@
/* Version number of package */
#undef VERSION
-/* Defined if compiling without arts */
-#undef WITHOUT_ARTS
-
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
@@ -196,18 +187,6 @@
-#if !defined(HAVE_RES_INIT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-int res_init(void);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C" {
@@ -260,9 +239,8 @@ int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
-/* type to use in place of socklen_t if not defined */
-#undef kde_socklen_t
-
-/* type to use in place of socklen_t if not defined (deprecated, use
- kde_socklen_t) */
+/* Compatibility define */
#undef ksize_t
+
+/* Define the real type of socklen_t */
+#undef socklen_t
View
3,347 configure
845 additions, 2,502 deletions not shown
View
62 configure.in
@@ -1,7 +1,3 @@
-dnl =======================================================
-dnl FILE: ./admin/configure.in.min
-dnl =======================================================
-
dnl This file is part of the KDE libraries/packages
dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
@@ -17,8 +13,8 @@ dnl Library General Public License for more details.
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-dnl Boston, MA 02110-1301, USA.
+dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+dnl Boston, MA 02111-1307, USA.
# Original Author was Kalle@kde.org
# I lifted it in some mater. (Stephan Kulow)
@@ -59,10 +55,6 @@ AM_KDE_WITH_NLS
KDE_USE_QT(3.0.0)
AC_PATH_KDE
-dnl =======================================================
-dnl FILE: configure.in.in
-dnl =======================================================
-
#MIN_CONFIG(3.0.0)
dnl PACKAGE set before
@@ -107,18 +99,16 @@ AC_CHECK_HEADER([GL/gl.h], \
[AC_DEFINE(HAVE_OPENGL, 1, [openGL support]) have_gl=yes], \
[AC_DEFINE(NO_OPENGL, 1, [No openGL support])])
-AC_CHECK_HEADERS([dvdread/dvd_reader.h],\
-[], \
-[AC_MSG_ERROR([libdvdread may be missing]) ])
+AC_CHECK_HEADER([ffmpeg/avcodec.h], \
+[AC_DEFINE(OLD_FFMPEG,1, [old ffmpeg])], \
+ [AC_CHECK_HEADER([libavcodec/avcodec.h], \
+ [AC_DEFINE(NEW_FFMPEG,1, [new ffmpeg])], \
+ [AC_MSG_ERROR([libavcodec may be missing]) ])])
-dnl =======================================================
-dnl FILE: ./k9devices/configure.in.in
-dnl =======================================================
-
have_hal=no
AC_MSG_CHECKING(for the HAL)
@@ -257,10 +247,11 @@ KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ])
AC_CONFIG_FILES([ doc/k9copy/Makefile ])
-AC_CONFIG_FILES([ k9Mplayer/Makefile ])
+AC_CONFIG_FILES([ dvdread/Makefile ])
AC_CONFIG_FILES([ k9author/Makefile ])
AC_CONFIG_FILES([ k9decmpeg/Makefile ])
AC_CONFIG_FILES([ k9devices/Makefile ])
+AC_CONFIG_FILES([ k9Mplayer/Makefile ])
AC_CONFIG_FILES([ k9vamps/Makefile ])
AC_CONFIG_FILES([ libdvdnav/Makefile ])
AC_CONFIG_FILES([ libk9copy/Makefile ])
@@ -268,42 +259,9 @@ AC_CONFIG_FILES([ po/Makefile ])
AC_CONFIG_FILES([ src/Makefile ])
AC_CONFIG_FILES([ src/icons/Makefile ])
AC_OUTPUT
-# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
-if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
- # And if so, warn when they don't match
- if test "$kde_libs_prefix" != "$given_prefix"; then
- # And if kde doesn't know about the prefix yet
- echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
- if test $? -ne 0; then
- echo ""
- echo "Warning: you chose to install this package in $given_prefix,"
- echo "but KDE was found in $kde_libs_prefix."
- echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
- echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix"
- echo "Then restart KDE."
- echo ""
- fi
- fi
-fi
-
-if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
- echo ""
- echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
- echo "was not included. Therefore, GCC symbol visibility support remains disabled."
- echo ""
- echo "For better performance, consider including the Qt visibility supporting patch"
- echo "located at:"
- echo ""
- echo "http://bugs.kde.org/show_bug.cgi?id=109386"
- echo ""
- echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
- echo "everything will continue to work just fine without it."
- echo ""
-fi
-
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
- echo ""
+ echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
echo ""
View
8 configure.in.in
@@ -42,10 +42,12 @@ AC_CHECK_HEADER([GL/gl.h], \
[AC_DEFINE(HAVE_OPENGL, 1, [openGL support]) have_gl=yes], \
[AC_DEFINE(NO_OPENGL, 1, [No openGL support])])
-AC_CHECK_HEADERS([dvdread/dvd_reader.h],\
-[], \
-[AC_MSG_ERROR([libdvdread may be missing]) ])
+AC_CHECK_HEADER([ffmpeg/avcodec.h], \
+[AC_DEFINE(OLD_FFMPEG,1, [old ffmpeg])], \
+ [AC_CHECK_HEADER([libavcodec/avcodec.h], \
+ [AC_DEFINE(NEW_FFMPEG,1, [new ffmpeg])], \
+ [AC_MSG_ERROR([libavcodec may be missing]) ])])
View
23 doc/Makefile.in
@@ -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,
@@ -104,7 +104,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@
@@ -114,7 +113,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@
@@ -124,7 +122,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@
@@ -137,14 +134,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@
@@ -163,22 +156,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@
@@ -190,7 +177,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -207,7 +193,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@
@@ -692,7 +677,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; \
@@ -719,6 +704,10 @@ 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
View
35 doc/k9copy/Makefile.in
@@ -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,
@@ -81,7 +81,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@
@@ -91,7 +90,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@
@@ -101,7 +99,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@
@@ -114,14 +111,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@
@@ -140,22 +133,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@
@@ -167,7 +154,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -184,7 +170,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@
@@ -499,10 +484,10 @@ uninstall-am:
.NOEXPORT:
#>+ 2
-KDE_DIST=playback.png mainwindow.png settingsMencoder.png Makefile.in keepmenus.png btnmp4.png settingsMP4.png index.xml btncopy.png index.docbook open1.png treeview.png Makefile.am settingsDVD.png open2.png
+KDE_DIST=playback.png mainwindow.png settingsMencoder.png Makefile.in keepmenus.png btnmp4.png settingsMP4.png btncopy.png index.docbook open1.png treeview.png Makefile.am open2.png settingsDVD.png
#>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) btnmp4.png mainwindow.png treeview.png open2.png playback.png settingsDVD.png settingsMencoder.png settingsMP4.png keepmenus.png btncopy.png index.xml index.docbook open1.png
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) open1.png btncopy.png btnmp4.png playback.png index.docbook settingsDVD.png treeview.png keepmenus.png open2.png mainwindow.png settingsMencoder.png settingsMP4.png
@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
docs-am: index.cache.bz2
@@ -520,7 +505,7 @@ install-docs: docs-am install-nls
$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k9copy/common
uninstall-docs:
- -rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k9copy
+ -rm -rf $(kde_htmldir)/$(KDE_LANG)/k9copy
clean-docs:
-rm -f index.cache.bz2
@@ -529,20 +514,20 @@ clean-docs:
#>+ 13
install-nls:
$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k9copy
- @for base in btnmp4.png mainwindow.png treeview.png open2.png playback.png settingsDVD.png settingsMencoder.png settingsMP4.png keepmenus.png btncopy.png index.xml index.docbook open1.png ; do \
+ @for base in open1.png btncopy.png btnmp4.png playback.png index.docbook settingsDVD.png treeview.png keepmenus.png open2.png mainwindow.png settingsMencoder.png settingsMP4.png ; do \
echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k9copy/$$base ;\
$(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k9copy/$$base ;\
done
uninstall-nls:
- for base in btnmp4.png mainwindow.png treeview.png open2.png playback.png settingsDVD.png settingsMencoder.png settingsMP4.png keepmenus.png btncopy.png index.xml index.docbook open1.png ; do \
+ for base in open1.png btncopy.png btnmp4.png playback.png index.docbook settingsDVD.png treeview.png keepmenus.png open2.png mainwindow.png settingsMencoder.png settingsMP4.png ; do \
rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/k9copy/$$base ;\
done
#>+ 5
distdir-nls:
- for file in btnmp4.png mainwindow.png treeview.png open2.png playback.png settingsDVD.png settingsMencoder.png settingsMP4.png keepmenus.png btncopy.png index.xml index.docbook open1.png ; do \
+ for file in open1.png btncopy.png btnmp4.png playback.png index.docbook settingsDVD.png treeview.png keepmenus.png open2.png mainwindow.png settingsMencoder.png settingsMP4.png ; do \
cp $(srcdir)/$$file $(distdir); \
done
@@ -574,7 +559,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; \
@@ -601,6 +586,10 @@ 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
View
2  k9Mplayer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/libk9copy $(all_includes)
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
METASOURCES = AUTO
noinst_LTLIBRARIES = libk9mplayer.la
View
4 k9author/Makefile.am
@@ -14,5 +14,5 @@ noinst_HEADERS = k9avidecode.h k9avifile.h k9canvasselection.h k9chapteredit.h \
k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI)
-INCLUDES = -I$(top_srcdir)/k9devices -I$(top_srcdir)/k9vamps \
- -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
View
7 k9author/k9avidecode.cpp
@@ -10,7 +10,14 @@
//
//
#include "k9avidecode.h"
+
+#ifdef OLD_FFMPEG
#include <ffmpeg/avcodec.h>
+#endif
+#ifdef NEW_FFMPEG
+#include <libavcodec/avcodec.h>
+#endif
+
#include <qimage.h>
#include <dlfcn.h>
#include <klocale.h>
View
7 k9author/k9avidecode.h
@@ -14,7 +14,14 @@
#include "k9common.h"
#include <qobject.h>
+#ifdef OLD_FFMPEG
#include <ffmpeg/avformat.h>
+#endif
+#ifdef NEW_FFMPEG
+#include <libavformat/avformat.h>
+#endif
+
+
#include <qimage.h>
/**
View
4 k9decmpeg/Makefile.am
@@ -12,8 +12,8 @@ libk9decmpeg_la_SOURCES = alloc.cpp attributes.h bswap.h convert_internal.h \
motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
-INCLUDES = -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav \
- -I$(top_srcdir)/libk9copy
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
noinst_HEADERS = k9decodethread.h k9plaympeg2.h
View
27 k9decmpeg/Makefile.in
@@ -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,
@@ -146,7 +146,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@
@@ -156,7 +155,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@
@@ -166,7 +164,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@
@@ -179,14 +176,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@
@@ -205,22 +198,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@
@@ -232,7 +219,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -249,7 +235,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@
@@ -374,8 +359,8 @@ libk9decmpeg_la_SOURCES = alloc.cpp attributes.h bswap.h convert_internal.h \
mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
-INCLUDES = -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav \
- -I$(top_srcdir)/libk9copy
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
noinst_HEADERS = k9decodethread.h k9plaympeg2.h
#>- all: all-am
@@ -730,7 +715,7 @@ bcheck-am:
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ if ! $(CXXCOMPILE) --dump-class-hierarchy $$i.bchecktest.cc; then \
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
@@ -773,6 +758,10 @@ no-final-install:
$(MAKE) libk9decmpeg_la_OBJECTS="$(libk9decmpeg_la_nofinal_OBJECTS)" 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
View
4 k9devices/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/libk9copy $(all_includes) $(HAL_INCS) $(DBUS_INCS) \
- $(K3B_INCS)
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
+ $(HAL_INCS) $(K3B_INCS) $(all_includes)
METASOURCES = AUTO
libk9devices_la_LDFLAGS = $(all_libraries)
noinst_LTLIBRARIES = libk9devices.la
View
43 k9devices/Makefile.in
@@ -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,
@@ -130,7 +130,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@
@@ -140,7 +139,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@
@@ -150,7 +148,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@
@@ -163,14 +160,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@
@@ -189,22 +182,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@
@@ -216,7 +203,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -233,7 +219,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@
@@ -346,8 +331,8 @@ x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
-INCLUDES = -I$(top_srcdir)/libk9copy $(all_includes) $(HAL_INCS) $(DBUS_INCS) \
- $(K3B_INCS)
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \
+ $(HAL_INCS) $(K3B_INCS) $(all_includes)
#>- METASOURCES = AUTO
libk9devices_la_LDFLAGS = $(all_libraries)
@@ -647,18 +632,18 @@ k9halconnection.moc: $(srcdir)/k9halconnection.h
mocs: k9halconnection.moc
#>+ 3
-k9dbusdispatch.moc: $(srcdir)/k9dbusdispatch.h
- $(MOC) $(srcdir)/k9dbusdispatch.h -o k9dbusdispatch.moc
+k9haldevice.moc: $(srcdir)/k9haldevice.h
+ $(MOC) $(srcdir)/k9haldevice.h -o k9haldevice.moc
#>+ 2
-mocs: k9dbusdispatch.moc
+mocs: k9haldevice.moc
#>+ 3
-k9haldevice.moc: $(srcdir)/k9haldevice.h
- $(MOC) $(srcdir)/k9haldevice.h -o k9haldevice.moc
+k9dbusdispatch.moc: $(srcdir)/k9dbusdispatch.h
+ $(MOC) $(srcdir)/k9dbusdispatch.h -o k9dbusdispatch.moc
#>+ 2
-mocs: k9haldevice.moc
+mocs: k9dbusdispatch.moc
#>+ 3
k9cddrive.moc: $(srcdir)/k9cddrive.h
@@ -669,7 +654,7 @@ mocs: k9cddrive.moc
#>+ 3
clean-metasources:
- -rm -f k9halconnection.moc k9dbusdispatch.moc k9haldevice.moc k9cddrive.moc
+ -rm -f k9halconnection.moc k9haldevice.moc k9dbusdispatch.moc k9cddrive.moc
#>+ 2
KDE_DIST=configure.in.in Makefile.in Makefile.am
@@ -705,7 +690,7 @@ bcheck-am:
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ if ! $(CXXCOMPILE) --dump-class-hierarchy $$i.bchecktest.cc; then \
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
@@ -716,7 +701,7 @@ bcheck-am:
#>+ 11
-libk9devices_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k9halconnection.cpp $(srcdir)/k9haldevice.cpp $(srcdir)/k9cddrive.cpp $(srcdir)/k9dbusdispatch.cpp k9halconnection.moc k9haldevice.moc k9dbusdispatch.moc k9cddrive.moc
+libk9devices_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k9halconnection.cpp $(srcdir)/k9haldevice.cpp $(srcdir)/k9cddrive.cpp $(srcdir)/k9dbusdispatch.cpp k9halconnection.moc k9dbusdispatch.moc k9haldevice.moc k9cddrive.moc
@echo 'creating libk9devices_la.all_cpp.cpp ...'; \
rm -f libk9devices_la.all_cpp.files libk9devices_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libk9devices_la.all_cpp.final; \
@@ -748,6 +733,10 @@ no-final-install:
$(MAKE) libk9devices_la_OBJECTS="$(libk9devices_la_nofinal_OBJECTS)" 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
View
3  k9vamps/Makefile.am
@@ -7,5 +7,6 @@ libk9vamps_la_LDFLAGS = $(all_libraries)
noinst_LTLIBRARIES = libk9vamps.la
libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
-INCLUDES = -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libk9copy
noinst_HEADERS = k9requant.h ac.h k9fifo.h
View
29 k9vamps/Makefile.in
@@ -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,
@@ -137,7 +137,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@
@@ -147,7 +146,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@
@@ -157,7 +155,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@
@@ -170,14 +167,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@
@@ -196,22 +189,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@
@@ -223,7 +210,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -240,7 +226,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@
@@ -361,7 +346,9 @@ noinst_LTLIBRARIES = libk9vamps.la
libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
-INCLUDES = -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \
+ -I$(top_srcdir)/libk9copy
+
noinst_HEADERS = k9requant.h ac.h k9fifo.h
#>- all: all-am
#>+ 1
@@ -647,7 +634,7 @@ uninstall-am:
.NOEXPORT:
#>+ 2
-KDE_DIST=k9requant2.cpp Makefile.in k9requant2.h Makefile.am
+KDE_DIST=Makefile.in Makefile.am
#>+ 2
docs-am:
@@ -680,7 +667,7 @@ bcheck-am:
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ if ! $(CXXCOMPILE) --dump-class-hierarchy $$i.bchecktest.cc; then \
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
@@ -723,6 +710,10 @@ no-final-install:
$(MAKE) libk9vamps_la_OBJECTS="$(libk9vamps_la_nofinal_OBJECTS)" 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
View
5 libdvdnav/Makefile.am
@@ -3,11 +3,12 @@ METASOURCES = AUTO
noinst_LTLIBRARIES = libk9dvdnav.la
libk9dvdnav_la_SOURCES = decoder.c decoder.h dvdnav.c dvdnav_events.h dvdnav.h \
- dvdnav_internal.h highlight.c navigation.c read_cache.c read_cache.h remap.c remap.h \
- searching.c settings.c vm.c vmcmd.c vmcmd.h vm.h compat.h dvd_types.h dvdread.c
+ dvdnav_internal.h highlight.c navigation.c read_cache.c read_cache.h remap.c remap.h \
+ searching.c settings.c vm.c vmcmd.c vmcmd.h vm.h compat.h dvd_types.h
noinst_HEADERS = common.h dvdread.h
+INCLUDES = -I$(top_srcdir)/dvdread
View
35 libdvdnav/Makefile.in
@@ -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,
@@ -50,13 +50,13 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libk9dvdnav_la_LIBADD =
am_libk9dvdnav_la_OBJECTS = decoder.lo dvdnav.lo highlight.lo \
navigation.lo read_cache.lo remap.lo searching.lo settings.lo \
- vm.lo vmcmd.lo dvdread.lo
+ vm.lo vmcmd.lo
#>- libk9dvdnav_la_OBJECTS = $(am_libk9dvdnav_la_OBJECTS)
#>+ 6
-libk9dvdnav_la_final_OBJECTS = decoder.lo dvdnav.lo highlight.lo navigation.lo read_cache.lo remap.lo searching.lo settings.lo vm.lo vmcmd.lo dvdread.lo
+libk9dvdnav_la_final_OBJECTS = decoder.lo dvdnav.lo highlight.lo navigation.lo read_cache.lo remap.lo searching.lo settings.lo vm.lo vmcmd.lo
libk9dvdnav_la_nofinal_OBJECTS = decoder.lo dvdnav.lo highlight.lo \
navigation.lo read_cache.lo remap.lo searching.lo settings.lo \
- vm.lo vmcmd.lo dvdread.lo
+ vm.lo vmcmd.lo
@KDE_USE_FINAL_FALSE@libk9dvdnav_la_OBJECTS = $(libk9dvdnav_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@libk9dvdnav_la_OBJECTS = $(libk9dvdnav_la_final_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -112,7 +112,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@
@@ -122,7 +121,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@
@@ -132,7 +130,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@
@@ -145,14 +142,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@
@@ -171,22 +164,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@
@@ -198,7 +185,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -215,7 +201,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@
@@ -331,10 +316,11 @@ xdg_menudir = @xdg_menudir@
#>- METASOURCES = AUTO
noinst_LTLIBRARIES = libk9dvdnav.la
libk9dvdnav_la_SOURCES = decoder.c decoder.h dvdnav.c dvdnav_events.h dvdnav.h \
- dvdnav_internal.h highlight.c navigation.c read_cache.c read_cache.h remap.c remap.h \
- searching.c settings.c vm.c vmcmd.c vmcmd.h vm.h compat.h dvd_types.h dvdread.c
+ dvdnav_internal.h highlight.c navigation.c read_cache.c read_cache.h remap.c remap.h \
+ searching.c settings.c vm.c vmcmd.c vmcmd.h vm.h compat.h dvd_types.h
noinst_HEADERS = common.h dvdread.h
+INCLUDES = -I$(top_srcdir)/dvdread
#>- all: all-am
#>+ 1
all: docs-am all-am
@@ -403,7 +389,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvdnav.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvdread.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/highlight.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/navigation.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read_cache.Plo@am__quote@
@@ -658,7 +643,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; \
@@ -685,6 +670,10 @@ no-final-install:
$(MAKE) libk9dvdnav_la_OBJECTS="$(libk9dvdnav_la_nofinal_OBJECTS)" 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
View
11 libdvdnav/common.h
@@ -9,9 +9,8 @@
#include <stdint.h>
#endif
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/ifo_print.h>
-#include <dvdread/nav_read.h>
-#include <dvdread/nav_types.h>
+#include "ifo_types.h"
+#include "dvd_reader.h"
+#include "ifo_read.h"
+#include "nav_read.h"
+#include "nav_types.h"
View
14 libdvdnav/dvdnav.c
@@ -42,7 +42,7 @@
static dvdnav_status_t dvdnav_clear(dvdnav_t * this) {
/* clear everything except file, vm, mutex, readahead */
- if (this->file) DvdreadF()->DVDCloseFile(this->file);
+ if (this->file) DVDCloseFile(this->file);
this->file = NULL;
memset(&this->pci,0,sizeof(this->pci));
@@ -101,7 +101,7 @@ dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path,dvd_reader_t *dvd)
strncpy(this->path, path, MAX_PATH_LEN);
/* Pre-open and close a file so that the CSS-keys are cached. */
- this->file = DvdreadF()->DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
+ this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);
/* Start the read-ahead cache. */
this->cache = dvdnav_read_cache_new(this);
@@ -131,7 +131,7 @@ dvdnav_status_t dvdnav_close(dvdnav_t *this) {
}
if (this->file) {
- DvdreadF()->DVDCloseFile(this->file);
+ DVDCloseFile(this->file);
#ifdef LOG_DEBUG
fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
#endif
@@ -282,7 +282,7 @@ static int32_t dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi,
#endif
if(p[0] == 0x00) {
- DvdreadF()->navRead_PCI(nav_pci, p+1);
+ navRead_PCI(nav_pci, p+1);
}
p += nPacketLen;
@@ -291,7 +291,7 @@ static int32_t dvdnav_decode_packet(dvdnav_t *this, uint8_t *p, dsi_t *nav_dsi,
if(p[6] == 0x01) {
nPacketLen = p[4] << 8 | p[5];
p += 6;
- DvdreadF()->navRead_DSI(nav_dsi, p+1);
+ navRead_DSI(nav_dsi, p+1);
}
return 1;
@@ -522,7 +522,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
dvdnav_vts_change_event_t *vts_event = (dvdnav_vts_change_event_t *)*buf;
if(this->file) {
- DvdreadF()->DVDCloseFile(this->file);
+ DVDCloseFile(this->file);
this->file = NULL;
}
@@ -553,7 +553,7 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
this->position_current.vts = this->position_next.vts;
this->position_current.domain = this->position_next.domain;
dvdnav_read_cache_clear(this->cache);
- this->file = DvdreadF()->DVDOpenFile(vm_get_dvd_reader(this->vm), vtsN, domain);
+ this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), vtsN, domain);
vts_event->new_vtsN = this->position_next.vts;
vts_event->new_domain = this->position_next.domain;
View
74 libdvdnav/dvdread.c
@@ -1,74 +0,0 @@
-#include "dvdread.h"
-
-#include <dlfcn.h>
-
-void *libHandle=0;
-
-DvdreadFunctions_t f_dvdread;
-
-void loadDvdread() {
- libHandle=dlopen("libdvdread.so",RTLD_LAZY | RTLD_GLOBAL);
- if (!libHandle) {
- libHandle=dlopen("libdvdread.so.3",RTLD_LAZY | RTLD_GLOBAL);
- }
- if (!libHandle) {
- libHandle=dlopen("libdvdread.so.2",RTLD_LAZY | RTLD_GLOBAL);
- }
- f_dvdread.DVDOpen=dlsym(libHandle,"DVDOpen");
- f_dvdread.DVDOpenFile=dlsym(libHandle,"DVDOpenFile");
- f_dvdread.DVDClose=dlsym(libHandle,"DVDClose");
- f_dvdread.DVDCloseFile=dlsym(libHandle,"DVDCloseFile");
- f_dvdread.DVDReadBlocks=dlsym(libHandle,"DVDReadBlocks");
- f_dvdread.DVDFileSeek=dlsym(libHandle,"DVDFileSeek");
- f_dvdread.DVDReadBytes=dlsym(libHandle,"DVDReadBytes");
- f_dvdread.DVDFileSize=dlsym(libHandle,"DVDFileSize");
- f_dvdread.DVDDiscID=dlsym(libHandle,"DVDDiscID");
- f_dvdread.DVDUDFVolumeInfo=dlsym(libHandle,"DVDUDFVolumeInfo");
- f_dvdread.DVDISOVolumeInfo=dlsym(libHandle,"DVDISOVolumeInfo");
- f_dvdread.DVDUDFCacheLevel=dlsym(libHandle,"DVDUDFCacheLevel");
- f_dvdread.navRead_PCI=dlsym(libHandle,"navRead_PCI");
- f_dvdread.navRead_DSI=dlsym(libHandle,"navRead_DSI");
-
-
- f_dvdread.ifoOpen=dlsym(libHandle,"ifoOpen");
- f_dvdread.ifoOpenVMGI=dlsym(libHandle,"ifoOpenVMGI");
- f_dvdread.ifoOpenVTSI=dlsym(libHandle,"ifoOpenVTSI");
- f_dvdread.ifoClose=dlsym(libHandle,"ifoClose");
- f_dvdread.ifoRead_PTL_MAIT=dlsym(libHandle,"ifoRead_PTL_MAIT");
- f_dvdread.ifoRead_VTS_ATRT=dlsym(libHandle,"ifoRead_VTS_ATRT");
- f_dvdread.ifoRead_TT_SRPT=dlsym(libHandle,"ifoRead_TT_SRPT");
- f_dvdread.ifoRead_VTS_PTT_SRPT=dlsym(libHandle,"ifoRead_VTS_PTT_SRPT");
-
- f_dvdread.ifoRead_FP_PGC=dlsym(libHandle,"ifoRead_FP_PGC");
- f_dvdread.ifoRead_PGCIT=dlsym(libHandle,"ifoRead_PGCIT");
- f_dvdread.ifoRead_PGCI_UT=dlsym(libHandle,"ifoRead_PGCI_UT");
- f_dvdread.ifoRead_VTS_TMAPT=dlsym(libHandle,"ifoRead_VTS_TMAPT");
- f_dvdread.ifoRead_C_ADT=dlsym(libHandle,"ifoRead_C_ADT");
- f_dvdread.ifoRead_TITLE_C_ADT=dlsym(libHandle,"ifoRead_TITLE_C_ADT");
- f_dvdread.ifoRead_VOBU_ADMAP=dlsym(libHandle,"ifoRead_VOBU_ADMAP");
- f_dvdread.ifoRead_TITLE_VOBU_ADMAP=dlsym(libHandle,"ifoRead_TITLE_VOBU_ADMAP");
- f_dvdread.ifoRead_TXTDT_MGI=dlsym(libHandle,"ifoRead_TXTDT_MGI");
-
- f_dvdread.ifoFree_PTL_MAIT=dlsym(libHandle,"ifoFree_PTL_MAIT");
- f_dvdread.ifoFree_VTS_ATRT=dlsym(libHandle,"ifoFree_VTS_ATRT");
- f_dvdread.ifoFree_TT_SRPT=dlsym(libHandle,"ifoFree_TT_SRPT");
- f_dvdread.ifoFree_VTS_PTT_SRPT=dlsym(libHandle,"ifoFree_VTS_PTT_SRPT");
- f_dvdread.ifoFree_FP_PGC=dlsym(libHandle,"ifoFree_FP_PGC");
- f_dvdread.ifoFree_PGCIT=dlsym(libHandle,"ifoFree_PGCIT");
- f_dvdread.ifoFree_PGCI_UT=dlsym(libHandle,"ifoFree_PGCI_UT");
- f_dvdread.ifoFree_VTS_TMAPT=dlsym(libHandle,"ifoFree_VTS_TMAPT");
- f_dvdread.ifoFree_C_ADT=dlsym(libHandle,"ifoFree_C_ADT");
- f_dvdread.ifoFree_TITLE_C_ADT=dlsym(libHandle,"ifoFree_TITLE_C_ADT");
- f_dvdread.ifoFree_VOBU_ADMAP=dlsym(libHandle,"ifoFree_VOBU_ADMAP");
- f_dvdread.ifoFree_TITLE_VOBU_ADMAP=dlsym(libHandle,"ifoFree_TITLE_VOBU_ADMAP");
- f_dvdread.ifoFree_TXTDT_MGI=dlsym(libHandle,"ifoFree_TXTDT_MGI");
-
-}
-
-DvdreadFunctions_t *DvdreadF(void) {
- return &f_dvdread;
-}
-
-void unloadDvdread() {
- dlclose(libHandle);
-}
View
107 libdvdnav/dvdread.h
@@ -22,113 +22,6 @@ extern "C" {
#include "common.h"
-/*** dvd_reader ***/
-typedef dvd_reader_t * (*DVDOpen_t) ( const char * );
-typedef void (*DVDClose_t)( dvd_reader_t * );
-typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
-typedef void (*DVDCloseFile_t) ( dvd_file_t * );
-typedef ssize_t (*DVDReadBlocks_t) ( dvd_file_t *, int, size_t, unsigned char * );
-typedef int (*DVDFileSeek_t)( dvd_file_t *, int );
-typedef ssize_t (*DVDReadBytes_t) ( dvd_file_t *, void *, size_t );
-typedef ssize_t (*DVDFileSize_t)( dvd_file_t * );
-typedef int (*DVDDiscID_t)( dvd_reader_t *, unsigned char * );
-typedef int (*DVDUDFVolumeInfo_t)( dvd_reader_t *, char *, unsigned int, unsigned char *, unsigned int );
-typedef int (*DVDISOVolumeInfo_t)( dvd_reader_t *, char *, unsigned int,unsigned char *, unsigned int );
-typedef int (*DVDUDFCacheLevel_t)( dvd_reader_t *, int );
-
-/*** nav_read ***/
-typedef void (*navRead_PCI_t)(pci_t *, unsigned char *);
-typedef void (*navRead_DSI_t)(dsi_t *, unsigned char *);
-
-/*** ifo_read ***/
-
-typedef ifo_handle_t * (*ifoOpen_t)(dvd_reader_t *, int );
-typedef ifo_handle_t * (*ifoOpenVMGI_t)(dvd_reader_t *);
-typedef ifo_handle_t * (*ifoOpenVTSI_t)(dvd_reader_t *, int);
-typedef void (*ifoClose_t)(ifo_handle_t *);
-typedef int (*ifoRead_PTL_MAIT_t)(ifo_handle_t *);
-typedef int (*ifoRead_VTS_ATRT_t)(ifo_handle_t *);
-typedef int (*ifoRead_TT_SRPT_t)(ifo_handle_t *);
-typedef int (*ifoRead_VTS_PTT_SRPT_t)(ifo_handle_t *);
-typedef int (*ifoRead_FP_PGC_t)(ifo_handle_t *);
-typedef int (*ifoRead_PGCIT_t)(ifo_handle_t *);
-typedef int (*ifoRead_PGCI_UT_t)(ifo_handle_t *);
-typedef int (*ifoRead_VTS_TMAPT_t)(ifo_handle_t *);
-typedef int (*ifoRead_C_ADT_t)(ifo_handle_t *);
-typedef int (*ifoRead_TITLE_C_ADT_t)(ifo_handle_t *);
-typedef int (*ifoRead_VOBU_ADMAP_t)(ifo_handle_t *);
-typedef int (*ifoRead_TITLE_VOBU_ADMAP_t)(ifo_handle_t *);
-typedef int (*ifoRead_TXTDT_MGI_t)(ifo_handle_t *);
-
-typedef void (*ifoFree_PTL_MAIT_t)(ifo_handle_t *);
-typedef void (*ifoFree_VTS_ATRT_t)(ifo_handle_t *);
-typedef void (*ifoFree_TT_SRPT_t)(ifo_handle_t *);
-typedef void (*ifoFree_VTS_PTT_SRPT_t)(ifo_handle_t *);
-typedef void (*ifoFree_FP_PGC_t)(ifo_handle_t *);
-typedef void (*ifoFree_PGCIT_t)(ifo_handle_t *);
-typedef void (*ifoFree_PGCI_UT_t)(ifo_handle_t *);
-typedef void (*ifoFree_VTS_TMAPT_t)(ifo_handle_t *);
-typedef void (*ifoFree_C_ADT_t)(ifo_handle_t *);
-typedef void (*ifoFree_TITLE_C_ADT_t)(ifo_handle_t *);
-typedef void (*ifoFree_VOBU_ADMAP_t)(ifo_handle_t *);
-typedef void (*ifoFree_TITLE_VOBU_ADMAP_t)(ifo_handle_t *);
-typedef void (*ifoFree_TXTDT_MGI_t)(ifo_handle_t *);
-
-
-typedef struct {
- DVDOpen_t DVDOpen;
- DVDClose_t DVDClose;
- DVDOpenFile_t DVDOpenFile;
- DVDCloseFile_t DVDCloseFile;
- DVDReadBlocks_t DVDReadBlocks;
- DVDFileSeek_t DVDFileSeek;
- DVDReadBytes_t DVDReadBytes;
- DVDFileSize_t DVDFileSize;
- DVDDiscID_t DVDDiscID;
- DVDUDFVolumeInfo_t DVDUDFVolumeInfo;
- DVDISOVolumeInfo_t DVDISOVolumeInfo;
- DVDUDFCacheLevel_t DVDUDFCacheLevel;
- navRead_PCI_t navRead_PCI;
- navRead_DSI_t navRead_DSI;
-
- ifoOpen_t ifoOpen;
- ifoOpenVMGI_t ifoOpenVMGI;
- ifoOpenVTSI_t ifoOpenVTSI;
- ifoClose_t ifoClose;
- ifoRead_PTL_MAIT_t ifoRead_PTL_MAIT;
- ifoRead_VTS_ATRT_t ifoRead_VTS_ATRT;
- ifoRead_TT_SRPT_t ifoRead_TT_SRPT;
- ifoRead_VTS_PTT_SRPT_t ifoRead_VTS_PTT_SRPT;
- ifoRead_FP_PGC_t ifoRead_FP_PGC;
- ifoRead_PGCIT_t ifoRead_PGCIT;
- ifoRead_PGCI_UT_t ifoRead_PGCI_UT;
- ifoRead_VTS_TMAPT_t ifoRead_VTS_TMAPT;
- ifoRead_C_ADT_t ifoRead_C_ADT;
- ifoRead_TITLE_C_ADT_t ifoRead_TITLE_C_ADT;
- ifoRead_VOBU_ADMAP_t ifoRead_VOBU_ADMAP;
- ifoRead_TITLE_VOBU_ADMAP_t ifoRead_TITLE_VOBU_ADMAP;
- ifoRead_TXTDT_MGI_t ifoRead_TXTDT_MGI;
-
- ifoFree_PTL_MAIT_t ifoFree_PTL_MAIT;
- ifoFree_VTS_ATRT_t ifoFree_VTS_ATRT;
- ifoFree_TT_SRPT_t ifoFree_TT_SRPT;
- ifoFree_VTS_PTT_SRPT_t ifoFree_VTS_PTT_SRPT;
- ifoFree_FP_PGC_t ifoFree_FP_PGC;
- ifoFree_PGCIT_t ifoFree_PGCIT;
- ifoFree_PGCI_UT_t ifoFree_PGCI_UT;
- ifoFree_VTS_TMAPT_t ifoFree_VTS_TMAPT;
- ifoFree_C_ADT_t ifoFree_C_ADT;
- ifoFree_TITLE_C_ADT_t ifoFree_TITLE_C_ADT;
- ifoFree_VOBU_ADMAP_t ifoFree_VOBU_ADMAP;
- ifoFree_TITLE_VOBU_ADMAP_t ifoFree_TITLE_VOBU_ADMAP;
- ifoFree_TXTDT_MGI_t ifoFree_TXTDT_MGI;
-
-
-} DvdreadFunctions_t;
-
-DvdreadFunctions_t *DvdreadF(void);
-void loadDvdread(void);
-void unloadDvdread(void);
#ifdef __cplusplus
}
#endif
View
4 libdvdnav/read_cache.c
@@ -297,7 +297,7 @@ int dvdnav_read_cache_block(read_cache_t *self, int sector, size_t block_count,
dprintf("libdvdnav: read_ahead_size=%d, size=%d\n", self->read_ahead_size, size);
if (size)
- chunk->cache_read_count += DvdreadF()->DVDReadBlocks(self->dvd_self->file,
+ chunk->cache_read_count += DVDReadBlocks(self->dvd_self->file,
start,
size,
read_ahead_buf);
@@ -309,7 +309,7 @@ int dvdnav_read_cache_block(read_cache_t *self, int sector, size_t block_count,
if (self->dvd_self->use_read_ahead)
dprintf("cache miss on sector %d\n", sector);
- res = DvdreadF()->DVDReadBlocks(self->dvd_self->file,
+ res = DVDReadBlocks(self->dvd_self->file,
sector,
block_count,
*buf) * DVD_VIDEO_LB_LEN;
View
40 libdvdnav/vm.c
@@ -188,30 +188,30 @@ static int ifoOpenNewVTSI(vm_t *vm, dvd_reader_t *dvd, int vtsN) {
}
if(vm->vtsi != NULL)
- DvdreadF()->ifoClose(vm->vtsi);
+ ifoClose(vm->vtsi);
- vm->vtsi = DvdreadF()->ifoOpenVTSI(dvd, vtsN);
+ vm->vtsi = ifoOpenVTSI(dvd, vtsN);
if(vm->vtsi == NULL) {
fprintf(MSG_OUT, "libdvdnav: ifoOpenVTSI failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_VTS_PTT_SRPT(vm->vtsi)) {
+ if(!ifoRead_VTS_PTT_SRPT(vm->vtsi)) {
fprintf(MSG_OUT, "libdvdnav: ifoRead_VTS_PTT_SRPT failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_PGCIT(vm->vtsi)) {
+ if(!ifoRead_PGCIT(vm->vtsi)) {
fprintf(MSG_OUT, "libdvdnav: ifoRead_PGCIT failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_PGCI_UT(vm->vtsi)) {
+ if(!ifoRead_PGCI_UT(vm->vtsi)) {
fprintf(MSG_OUT, "libdvdnav: ifoRead_PGCI_UT failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_VOBU_ADMAP(vm->vtsi)) {
+ if(!ifoRead_VOBU_ADMAP(vm->vtsi)) {
fprintf(MSG_OUT, "libdvdnav: ifoRead_VOBU_ADMAP vtsi failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_TITLE_VOBU_ADMAP(vm->vtsi)) {
+ if(!ifoRead_TITLE_VOBU_ADMAP(vm->vtsi)) {
fprintf(MSG_OUT, "libdvdnav: ifoRead_TITLE_VOBU_ADMAP vtsi failed\n");
return 0;
}
@@ -262,16 +262,16 @@ int vm_start(vm_t *vm) {
void vm_stop(vm_t *vm) {
if(vm->vmgi) {
- DvdreadF()->ifoClose(vm->vmgi);
+ ifoClose(vm->vmgi);
vm->vmgi=NULL;
}
if(vm->vtsi) {
- DvdreadF()->ifoClose(vm->vtsi);
+ ifoClose(vm->vtsi);
vm->vtsi=NULL;
}
if(vm->dvd) {
if (!vm->openedDvd)
- DvdreadF()->DVDClose(vm->dvd);
+ DVDClose(vm->dvd);
vm->dvd=NULL;
}
vm->stopped = 1;
@@ -320,39 +320,39 @@ int vm_reset(vm_t *vm, const char *dvdroot) {
if (vm->openedDvd) /*JMP we use the dvd opened by copy*/
vm->dvd=vm->openedDvd;
else
- vm->dvd = DvdreadF()->DVDOpen(dvdroot);
+ vm->dvd = DVDOpen(dvdroot);
if(!vm->dvd) {
fprintf(MSG_OUT, "libdvdnav: vm: faild to open/read the DVD\n");
return 0;
}
dvd_read_name(vm->dvd_name, dvdroot);
vm->map = remap_loadmap(vm->dvd_name);
- vm->vmgi = DvdreadF()->ifoOpenVMGI(vm->dvd);
+ vm->vmgi = ifoOpenVMGI(vm->dvd);
if(!vm->vmgi) {
fprintf(MSG_OUT, "libdvdnav: vm: faild to read VIDEO_TS.IFO\n");
return 0;
}
- if(!DvdreadF()->ifoRead_FP_PGC(vm->vmgi)) {
+ if(!ifoRead_FP_PGC(vm->vmgi)) {
fprintf(MSG_OUT, "libdvdnav: vm: ifoRead_FP_PGC failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_TT_SRPT(vm->vmgi)) {
+ if(!ifoRead_TT_SRPT(vm->vmgi)) {
fprintf(MSG_OUT, "libdvdnav: vm: ifoRead_TT_SRPT failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_PGCI_UT(vm->vmgi)) {
+ if(!ifoRead_PGCI_UT(vm->vmgi)) {
fprintf(MSG_OUT, "libdvdnav: vm: ifoRead_PGCI_UT failed\n");
return 0;
}
- if(!DvdreadF()->ifoRead_PTL_MAIT(vm->vmgi)) {
+ if(!ifoRead_PTL_MAIT(vm->vmgi)) {
fprintf(MSG_OUT, "libdvdnav: vm: ifoRead_PTL_MAIT failed\n");
/* return 0; Not really used for now.. */
}
- if(!DvdreadF()->ifoRead_VTS_ATRT(vm->vmgi)) {
+ if(!ifoRead_VTS_ATRT(vm->vmgi)) {
fprintf(MSG_OUT, "libdvdnav: vm: ifoRead_VTS_ATRT failed\n");
/* return 0; Not really used for now.. */
}
- if(!DvdreadF()->ifoRead_VOBU_ADMAP(vm->vmgi)) {
+ if(!ifoRead_VOBU_ADMAP(vm->vmgi)) {
fprintf(MSG_OUT, "libdvdnav: vm: ifoRead_VOBU_ADMAP vgmi failed\n");
/* return 0; Not really used for now.. */
}
@@ -402,14 +402,14 @@ vm_t *vm_new_copy(vm_t *source) {
void vm_merge(vm_t *target, vm_t *source) {
if(target->vtsi)
- DvdreadF()->ifoClose(target->vtsi);
+ ifoClose(target->vtsi);
memcpy(target, source, sizeof(vm_t));
memset(source, 0, sizeof(vm_t));
}
void vm_free_copy(vm_t *vm) {
if(vm->vtsi)
- DvdreadF()->ifoClose(vm->vtsi);
+ ifoClose(vm->vtsi);
free(vm);
}
View
4 libk9copy/Makefile.am
@@ -24,6 +24,6 @@ noinst_HEADERS = bswap.h k9audiocodecs.h k9backupdlg.h k9burndvd.h k9cell.h \
k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
-INCLUDES = -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9vamps \
- -I$(top_srcdir)/libdvdnav
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
libk9copy_la_LDFLAGS = $(all_libraries)
View
116 libk9copy/Makefile.in
@@ -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,
@@ -147,7 +147,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@
@@ -157,7 +156,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@
@@ -167,7 +165,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@
@@ -180,14 +177,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@
@@ -206,22 +199,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@
@@ -233,7 +220,6 @@ LIB_XRENDER = @LIB_XRENDER@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
MCOPIDL = @MCOPIDL@
MEINPROC = @MEINPROC@
MKDIR_P = @MKDIR_P@
@@ -250,7 +236,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@
@@ -390,8 +375,8 @@ noinst_HEADERS = bswap.h k9audiocodecs.h k9backupdlg.h k9burndvd.h k9cell.h \
k9ifo2.h k9mp4dlg.h k9mp4enc.h k9process.h k9processlist.h k9progress.h \
k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
-INCLUDES = -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9vamps \
- -I$(top_srcdir)/libdvdnav
+INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \
+ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
libk9copy_la_LDFLAGS = $(all_libraries)
#>- all: all-am
@@ -756,18 +741,18 @@ k9dvd.moc.cpp: $(srcdir)/k9dvd.h
mocs: k9dvd.moc.cpp
#>+ 3
-k9titleencopt.moc: $(srcdir)/k9titleencopt.h
- $(MOC) $(srcdir)/k9titleencopt.h -o k9titleencopt.moc
+k9dvdtitleset.moc.cpp: $(srcdir)/k9dvdtitleset.h
+ $(MOC) $(srcdir)/k9dvdtitleset.h -o k9dvdtitleset.moc.cpp
#>+ 2
-mocs: k9titleencopt.moc
+mocs: k9dvdtitleset.moc.cpp
#>+ 3
-k9dvdtitleset.moc.cpp: $(srcdir)/k9dvdtitleset.h
- $(MOC) $(srcdir)/k9dvdtitleset.h -o k9dvdtitleset.moc.cpp
+k9titleencopt.moc: $(srcdir)/k9titleencopt.h
+ $(MOC) $(srcdir)/k9titleencopt.h -o k9titleencopt.moc
#>+ 2
-mocs: k9dvdtitleset.moc.cpp
+mocs: k9titleencopt.moc
#>+ 3
k9burndvd.moc: $(srcdir)/k9burndvd.h
@@ -840,11 +825,11 @@ k9backupdlg.moc: $(srcdir)/k9backupdlg.h
mocs: k9backupdlg.moc
#>+ 3
-k9dvdbackup.moc: $(srcdir)/k9dvdbackup.h
- $(MOC) $(srcdir)/k9dvdbackup.h -o k9dvdbackup.moc
+k9dvdchapter.moc.cpp: $(srcdir)/k9dvdchapter.h
+ $(MOC) $(srcdir)/k9dvdchapter.h -o k9dvdchapter.moc.cpp
#>+ 2
-mocs: k9dvdbackup.moc
+mocs: k9dvdchapter.moc.cpp
#>+ 3
k9videocodecs.moc: $(srcdir)/k9videocodecs.h
@@ -854,29 +839,29 @@ k9videocodecs.moc: $(srcdir)/k9videocodecs.h
mocs: k9videocodecs.moc
#>+ 3
-k9dvdchapter.moc.cpp: $(srcdir)/k9dvdchapter.h
- $(MOC) $(srcdir)/k9dvdchapter.h -o k9dvdchapter.moc.cpp
+k9mp4dlg.moc: $(srcdir)/k9mp4dlg.h
+ $(MOC) $(srcdir)/k9mp4dlg.h -o k9mp4dlg.moc
#>+ 2
-mocs: k9dvdchapter.moc.cpp
+mocs: k9mp4dlg.moc
#>+ 3
-k9process.moc: $(srcdir)/k9process.h
- $(MOC) $(srcdir)/k9process.h -o k9process.moc
+k9dvdbackup.moc: $(srcdir)/k9dvdbackup.h
+ $(MOC) $(srcdir)/k9dvdbackup.h -o k9dvdbackup.moc
#>+ 2
-mocs: k9process.moc
+mocs: k9dvdbackup.moc
#>+ 3
-k9mp4dlg.moc: $(srcdir)/k9mp4dlg.h
- $(MOC) $(srcdir)/k9mp4dlg.h -o k9mp4dlg.moc
+k9process.moc: $(srcdir)/k9process.h
+ $(MOC) $(srcdir)/k9process.h -o k9process.moc
#>+ 2
-mocs: k9mp4dlg.moc
+mocs: k9process.moc
#>+ 3
clean-metasources:
- -rm -f k9cell.moc k9dvdsize.moc.cpp k9dvdtitle.moc.cpp k9processlist.moc k9dvd.moc.cpp k9titleencopt.moc k9dvdtitleset.moc.cpp k9burndvd.moc k9mp4enc.moc k9dvdprogress.moc.cpp k9dvdauthor.moc.cpp k9ifo2.moc.cpp k9drawimage.moc k9audiocodecs.moc k9saveimage.moc k9progress.moc k9backupdlg.moc k9dvdbackup.moc k9videocodecs.moc k9dvdchapter.moc.cpp k9process.moc k9mp4dlg.moc
+ -rm -f k9cell.moc k9dvdsize.moc.cpp k9dvdtitle.moc.cpp k9processlist.moc k9dvd.moc.cpp k9dvdtitleset.moc.cpp k9titleencopt.moc k9burndvd.moc k9mp4enc.moc k9dvdprogress.moc.cpp k9dvdauthor.moc.cpp k9ifo2.moc.cpp k9drawimage.moc k9audiocodecs.moc k9saveimage.moc k9progress.moc k9backupdlg.moc k9dvdchapter.moc.cpp k9videocodecs.moc k9mp4dlg.moc k9dvdbackup.moc k9process.moc
#>+ 2
KDE_DIST=backupdlg.ui progress.ui Makefile.in mp4dlg.ui Makefile.am processList.ui dvdprogress.ui
@@ -921,7 +906,7 @@ bcheck-am:
echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
echo "$$i"; \
- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \
+ if ! $(CXXCOMPILE) --dump-class-hierarchy $$i.bchecktest.cc; then \
rm -f $$i.bchecktest.cc; exit 1; \
fi ; \
echo "" >> $$i.bchecktest.cc.class; \
@@ -932,7 +917,7 @@ bcheck-am:
#>+ 11
-libk9copy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k9audiocodecs.cpp $(srcdir)/k9backupdlg.cpp $(srcdir)/k9burndvd.cpp $(srcdir)/k9cell.cpp $(srcdir)/k9cellcopylist.cpp $(srcdir)/k9config.cpp $(srcdir)/k9drawimage.cpp $(srcdir)/k9dvd.cpp $(srcdir)/k9dvdauthor.cpp $(srcdir)/k9dvdbackup.cpp $(srcdir)/k9dvdchapter.cpp $(srcdir)/k9dvdprogress.cpp $(srcdir)/k9dvdread.cpp $(srcdir)/k9dvdsize.cpp $(srcdir)/k9dvdtitle.cpp $(srcdir)/k9dvdtitleset.cpp $(srcdir)/k9ifo2.cpp $(srcdir)/k9mp4dlg.cpp $(srcdir)/k9mp4enc.cpp $(srcdir)/k9process.cpp $(srcdir)/k9processlist.cpp $(srcdir)/k9progress.cpp $(srcdir)/k9saveimage.cpp $(srcdir)/k9script.cpp $(srcdir)/k9titleencopt.cpp $(srcdir)/k9tools.cpp $(srcdir)/k9videocodecs.cpp backupdlg.cpp dvdprogress.cpp mp4dlg.cpp processList.cpp progress.cpp k9dvdsize.moc.cpp k9dvdtitle.moc.cpp k9dvd.moc.cpp k9dvdtitleset.moc.cpp k9dvdprogress.moc.cpp k9dvdauthor.moc.cpp k9ifo2.moc.cpp k9dvdchapter.moc.cpp k9cell.moc k9processlist.moc processList.moc k9titleencopt.moc dvdprogress.moc k9burndvd.moc k9mp4enc.moc progress.moc backupdlg.moc mp4dlg.moc k9drawimage.moc k9audiocodecs.moc k9saveimage.moc k9backupdlg.moc k9progress.moc k9mp4dlg.moc k9process.moc k9videocodecs.moc k9dvdbackup.moc
+libk9copy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/k9audiocodecs.cpp $(srcdir)/k9backupdlg.cpp $(srcdir)/k9burndvd.cpp $(srcdir)/k9cell.cpp $(srcdir)/k9cellcopylist.cpp $(srcdir)/k9config.cpp $(srcdir)/k9drawimage.cpp $(srcdir)/k9dvd.cpp $(srcdir)/k9dvdauthor.cpp $(srcdir)/k9dvdbackup.cpp $(srcdir)/k9dvdchapter.cpp $(srcdir)/k9dvdprogress.cpp $(srcdir)/k9dvdread.cpp $(srcdir)/k9dvdsize.cpp $(srcdir)/k9dvdtitle.cpp $(srcdir)/k9dvdtitleset.cpp $(srcdir)/k9ifo2.cpp $(srcdir)/k9mp4dlg.cpp $(srcdir)/k9mp4enc.cpp $(srcdir)/k9process.cpp $(srcdir)/k9processlist.cpp $(srcdir)/k9progress.cpp $(srcdir)/k9saveimage.cpp $(srcdir)/k9script.cpp $(srcdir)/k9titleencopt.cpp $(srcdir)/k9tools.cpp $(srcdir)/k9videocodecs.cpp backupdlg.cpp dvdprogress.cpp mp4dlg.cpp processList.cpp progress.cpp k9dvdsize.moc.cpp k9dvdtitle.moc.cpp k9dvd.moc.cpp k9dvdtitleset.moc.cpp k9dvdprogress.moc.cpp k9dvdauthor.moc.cpp k9ifo2.moc.cpp k9dvdchapter.moc.cpp k9cell.moc k9processlist.moc processList.moc k9titleencopt.moc dvdprogress.moc k9burndvd.moc k9mp4enc.moc progress.moc backupdlg.moc mp4dlg.moc k9drawimage.moc k9audiocodecs.moc k9saveimage.moc k9backupdlg.moc k9progress.moc k9process.moc k9dvdbackup.moc k9mp4dlg.moc k9videocodecs.moc
@echo 'creating libk9copy_la.all_cpp.cpp ...'; \
rm -f libk9copy_la.all_cpp.files libk9copy_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> libk9copy_la.all_cpp.final; \
@@ -964,6 +949,10 @@ no-final-install:
$(MAKE) libk9copy_la_OBJECTS="$(libk9copy_la_nofinal_OBJECTS)" 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
@@ -1004,8 +993,8 @@ $(srcdir)/k9saveimage.cpp: backupdlg.h dvdprogress.h mp4dlg.h processList.h prog
k9burndvd.lo: k9burndvd.moc
k9videocodecs.lo: k9videocodecs.moc
$(srcdir)/k9drawimage.cpp: backupdlg.h dvdprogress.h mp4dlg.h processList.h progress.h
-k9dvdbackup.lo: k9dvdbackup.moc
k9mp4dlg.o: k9mp4dlg.moc
+k9dvdbackup.lo: k9dvdbackup.moc
$(srcdir)/k9titleencopt.cpp: backupdlg.h dvdprogress.h mp4dlg.h processList.h progress.h
k9dvdbackup.o: k9dvdbackup.moc
k9backupdlg.o: k9backupdlg.moc
@@ -1026,78 +1015,73 @@ k9saveimage.lo: k9saveimage.moc
$(srcdir)/k9cellcopylist.cpp: backupdlg.h dvdprogress.h mp4dlg.h processList.h progress.h
k9process.o: k9process.moc
-#>+ 75
+#>+ 70
dvdprogress.cpp: $(srcdir)/dvdprogress.ui dvdprogress.h dvdprogress.moc
rm -f dvdprogress.cpp
- echo '#include <kdialog.h>' > dvdprogress.cpp
- echo '#include <klocale.h>' >> dvdprogress.cpp
+ echo '#include <klocale.h>' > dvdprogress.cpp
$(UIC) -tr ${UIC_TR} -i dvdprogress.h $(srcdir)/dvdprogress.ui > dvdprogress.cpp.temp ; ret=$$?; \
- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" dvdprogress.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_dvdprogress,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> dvdprogress.cpp ;\
+ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" dvdprogress.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_dvdprogress,g" >> dvdprogress.cpp ;\
rm -f dvdprogress.cpp.temp ;\
if test "$$ret" = 0; then echo '#include "dvdprogress.moc"' >> dvdprogress.cpp; else rm -f dvdprogress.cpp ; exit $$ret ; fi
dvdprogress.h: $(srcdir)/dvdprogress.ui
- rm -rf dvdprogress.h;
- $(UIC) $(srcdir)/dvdprogress.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> dvdprogress.h ;
+ $(UIC) -o dvdprogress.h $(srcdir)/dvdprogress.ui
+
dvdprogress.moc: dvdprogress.h
$(MOC) dvdprogress.h -o dvdprogress.moc
progress.cpp: $(srcdir)/progress.ui progress.h progress.moc
rm -f progress.cpp
- echo '#include <kdialog.h>' > progress.cpp
- echo '#include <klocale.h>' >> progress.cpp
+ echo '#include <klocale.h>' > progress.cpp
$(UIC) -tr ${UIC_TR} -i progress.h $(srcdir)/progress.ui > progress.cpp.temp ; ret=$$?; \
- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" progress.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_progress,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> progress.cpp ;\
+ sed -e "s,${UIC_TR}( \"\" ),QString::null,g" progress.cpp.temp | sed -e "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | sed -e "s,image\([0-9][0-9]*\)_data,img\1_progress,g" >> progress.cpp ;\
rm -f progress.cpp.temp ;\