diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/.cvsignore kdemultimedia-3.1.4.19-4/.cvsignore --- kdemultimedia-3.1.4/.cvsignore 2002-10-28 19:33:06.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/.cvsignore 2003-02-13 17:28:56.000000000 +0100 @@ -1,21 +1,25 @@ +.autoconf_trace +MakeVars.in Makefile +Makefile.am Makefile.in Makefile.rules.in a.out acinclude.m4 aclocal.m4 autom4te*.cache +build-stamp config.h config.h.in configure +configure-stamp configure.files configure.in inst-apps libtool +obj-i386-linux +patch-stamp stamp-h stamp-h.in stamp-h1 subdirs -.autoconf_trace -MakeVars.in -Makefile.am diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/Makefile.cvs kdemultimedia-3.1.4.19-4/Makefile.cvs --- kdemultimedia-3.1.4/Makefile.cvs 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/Makefile.cvs 2002-05-28 22:43:22.000000000 +0200 @@ -0,0 +1,16 @@ + +all: + @echo "This Makefile is only for the CVS repository" + @echo "This will be deleted before making the distribution" + @echo "" + @if test ! -d admin; then \ + echo "Please recheckout this module!" ;\ + echo "for cvs: use checkout once and after that update again" ;\ + echo "for cvsup: checkout kde-common from cvsup and" ;\ + echo " link kde-common/admin to ./admin" ;\ + exit 1 ;\ + fi + $(MAKE) -f admin/Makefile.common cvs + +.SILENT: + diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/admin/acinclude.m4.in kdemultimedia-3.1.4.19-4/admin/acinclude.m4.in --- kdemultimedia-3.1.4/admin/acinclude.m4.in 2003-09-02 03:17:17.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/admin/acinclude.m4.in 2003-10-06 17:49:55.000000000 +0200 @@ -315,19 +315,16 @@ AC_DEFUN(AC_PATH_QT_MOC_UIC, if test -z "$UIC_PATH" ; then KDE_UIC_ERROR_MESSAGE exit 1 - else - UIC=$UIC_PATH - - if test $kde_qtver = 3; then + elif test $kde_qtver = 3; then KDE_CHECK_UIC_FLAG(L,[/nonexistant],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no) KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no) + UIC=$UIC_PATH if test x$ac_uic_supports_libpath = xyes; then UIC="$UIC -L \$(kde_widgetdir)" fi if test x$ac_uic_supports_nounload = xyes; then UIC="$UIC -nounload" - fi fi fi else @@ -978,7 +975,7 @@ kde_save_CFLAGS="$CFLAGS" kde_save_LIBS="$LIBS" LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" CFLAGS="$CFLAGS -I$x_includes" -LIBS="-lXinerama -lXext" +LIBS="-lXinerama_pic -lXext" if test "x$no_xinerama" = "xno"; then @@ -1000,7 +997,7 @@ LIBXINERAMA="" if test "$ac_cv_have_xinerama" = "yes"; then AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support]) - LIBXINERAMA="-lXinerama" + LIBXINERAMA="-lXinerama_pic" fi AC_SUBST(LIBXINERAMA) @@ -1146,14 +1143,10 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then - if test $kde_qtsubver -gt 1; then + if test $kde_qtsubver -gt 0; then kde_qt_verstring="QT_VERSION >= 0x030100" - else - if test $kde_qtsubver = 1; then - kde_qt_verstring="QT_VERSION >= 0x030100" - else - kde_qt_verstring="QT_VERSION >= 300" - fi + else + kde_qt_verstring="QT_VERSION >= 300" fi fi if test $kde_qtver = 2; then @@ -2839,11 +2832,11 @@ AC_DEFUN(AC_CHECK_COMPILERS, if test "$GCC" = "yes"; then case $host in *-*-linux-gnu) - CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS" - CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion $CXXFLAGS" + CFLAGS="-ansi -W -Wall -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE $CFLAGS" + CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_SVID_SOURCE -Wcast-align -Wconversion $CXXFLAGS" ;; esac - CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" + CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS" KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"]) KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"]) @@ -4193,11 +4186,10 @@ fi AC_DEFUN(KDE_CHECK_PYTHON, [ - KDE_CHECK_PYTHON_INTERN("2.3", - [KDE_CHECK_PYTHON_INTERN("2.2", - [KDE_CHECK_PYTHON_INTERN("2.1", - [KDE_CHECK_PYTHON_INTERN("2.0", [ KDE_CHECK_PYTHON_INTERN($1, $2) ]) - ])])]) + KDE_CHECK_PYTHON_INTERN("2.2", + [KDE_CHECK_PYTHON_INTERN("2.1", + [KDE_CHECK_PYTHON_INTERN("2.0", [ KDE_CHECK_PYTHON_INTERN($1, $2) ]) + ])]) ]) AC_DEFUN(KDE_CHECK_STL_SGI, @@ -4774,7 +4766,6 @@ else dnl No option set -> look in $PATH KDE_JAVA_PREFIX(/usr/j2se) - KDE_JAVA_PREFIX(/usr/lib/j2se) KDE_JAVA_PREFIX(/usr/j*dk*) KDE_JAVA_PREFIX(/usr/lib/j*dk*) KDE_JAVA_PREFIX(/opt/j*sdk*) @@ -4941,6 +4932,161 @@ kde_cv_java_includedir=$kde_java_include kde_cv_java_bindir=$kde_java_bindir ]) + dnl PAM pam + + dnl Should test for PAM (Pluggable Authentication Modules) + AC_DEFUN(AC_PATH_PAM_DIRECT, + [ + test -z "$pam_direct_test_library" && pam_direct_test_library=pam + test -z "$pam_direct_test_include" && pam_direct_test_include=security/pam_appl.h + + for ac_dir in \ + \ + /usr/local/include \ + /usr/include \ + /usr/unsupported/include \ + /opt/include \ + /usr/pam/include \ + /usr/local/pam/include \ + /usr/lib/pam/include \ + \ + $extra_include \ + ; \ + do + if test -r "$ac_dir/$pam_direct_test_include"; then + no_pam= ac_pam_includes=$ac_dir + break + fi + done + + # First see if replacing the include by lib works. + for ac_dir in `echo "$ac_pam_includes" | sed s/include/lib/` \ + \ + /lib \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /lib/security \ + /usr/security/lib \ + $extra_lib \ + ; \ + do + for ac_extension in a so sl; do + if test -r $ac_dir/lib${pam_direct_test_library}.$ac_extension; then + no_pam= ac_pam_libraries=$ac_dir + break 2 + fi + done + done +]) + +AC_DEFUN(AC_PATH_PAM, + [ + AC_REQUIRE([KDE_CHECK_LIBDL]) + AC_REQUIRE_CPP()dnl + + AC_CHECK_LIB(pam_misc, main, [PAM_MISC_LIB="-lpam_misc" + AC_DEFINE_UNQUOTED(HAVE_PAM_MISC, 1, [Define if you have a PAM implementation with the pam_misc library])], [], [-lpam $LIBDL]) + + AC_MSG_CHECKING(for PAM) + AC_ARG_WITH(pam, +[ --with-pam[=ARG] enable support for PAM: ARG=[yes|no|service name]], + [ + if test "x$withval" = "xyes"; then + no_pam= + default_pam=yes + use_pam=yes + pam_service=kde + elif test "x$withval" = "xno"; then + no_pam=yes + use_pam=no + else + no_pam= + use_pam=yes + pam_service="$withval" + if test -z "$pam_service"; then + default_pam=yes + else + default_pam= + fi + fi + ], no_pam=yes + ) + + if test ! "$no_pam" = yes; then + + AC_CACHE_VAL(ac_cv_path_pam, + [ + ac_pam_includes=NONE + ac_pam_libraries=NONE + if test -z "$pam_libraries"; then + pam_libraries=NONE + fi + if test -z "$pam_includes"; then + pam_includes=NONE + fi + + AC_PATH_PAM_DIRECT + + test "x$pam_includes" = xNONE && pam_includes=$ac_pam_includes + test "x$pam_libraries" = xNONE && pam_libraries=$ac_pam_libraries + + if test ! "x$pam_includes" = xNONE && test ! "x$pam_libraries" = xNONE; then + ac_pam_libs="-lpam $PAM_MISC_LIB $LIBDL" + ac_cv_path_pam="no_pam= ac_pam_includes=$ac_pam_includes ac_pam_libraries=$ac_pam_libraries ac_pam_libs=\"$ac_pam_libs\"" + else + ac_cv_path_pam="no_pam=yes" + fi + ]) + + eval "$ac_cv_path_pam" + + fi + + if test "$no_pam" = yes; then + AC_MSG_RESULT(no) + else + AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules); Redhat-Users!]) + PAMLIBS="$ac_pam_libs" + test "x$pam_includes" = xNONE && pam_includes=$ac_pam_includes + test "x$pam_libraries" = xNONE && pam_libraries=$ac_pam_libraries + AC_MSG_RESULT([libraries $pam_libraries, headers $pam_includes]) + AC_DEFINE_UNQUOTED(KDM_PAM_SERVICE,"$pam_service", [Define the name of the PAM service used by KDM]) + if test "$default_pam" = yes; then + AC_MSG_RESULT(["default pam service name will be used"]) + else + AC_DEFINE_UNQUOTED(KDE_PAM_SERVICE,"$pam_service", [Define to change the default name of the PAM service used by KDE]) + AC_MSG_RESULT(["pam service name will be: " $pam_service]) + fi +dnl test whether struct pam_message is const (Linux) or not (Sun) + pam_appl_h="$ac_pam_includes/security/pam_appl.h" + AC_MSG_CHECKING(for const pam_message) + AC_EGREP_HEADER([struct pam_message], + $pam_appl_h, + [ AC_EGREP_HEADER([const struct pam_message], + $pam_appl_h, + [AC_MSG_RESULT(["const: Linux-type PAM"]) ], + [AC_MSG_RESULT(["nonconst: Sun-type PAM"]) + AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])] + )], + [AC_MSG_RESULT(["not found - assume const, Linux-type PAM"])] + ) + fi + + if test "x$pam_libraries" != x && test "x$pam_libraries" != xNONE ; then + PAMLIBPATHS="-L$pam_libraries" + fi + if test "x$pam_includes" != x && test "x$pam_includes" != xNONE ; then + PAMINC="-I$pam_includes" + fi + + AC_SUBST(PAMINC) + AC_SUBST(PAMLIBS) + AC_SUBST(PAMLIBPATHS) + +]) + + dnl this is a redefinition of autoconf 2.5x's AC_FOREACH. dnl When the argument list becomes big, as in KDE for AC_OUTPUT in dnl big packages, m4_foreach is dog-slow. So use our own version of diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/admin/cvs-clean.pl kdemultimedia-3.1.4.19-4/admin/cvs-clean.pl --- kdemultimedia-3.1.4/admin/cvs-clean.pl 2002-04-23 19:14:38.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/admin/cvs-clean.pl 2003-10-06 17:49:55.000000000 +0200 @@ -41,6 +41,10 @@ sub cvsclean() my $dir = shift; my (%dirsdir, %filesdir, %dirscvs, %filescvs); my $dnam = $dir ? $dir : "."; + if (open (FILE, "<".$dir.".cleanignore")) { + close (FILE); + return; + } if (!opendir (DIR, $dnam)) { print STDERR "Cannot enter \"".$dnam."\".\n"; return; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/admin/cvs.sh kdemultimedia-3.1.4.19-4/admin/cvs.sh --- kdemultimedia-3.1.4/admin/cvs.sh 2003-09-03 02:11:14.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/admin/cvs.sh 2003-10-06 17:49:55.000000000 +0200 @@ -261,6 +261,14 @@ if test -f configure.in.in; then configure.in.new > configure.in && mv configure.in configure.in.new fi fi + +if test -f "debian/changelog"; then + # Xandros :: determine version from debian/changelog if we have one + DEB_VERSION=`head -n1 debian/changelog |sed -e s/^.*\(// |sed -e s/^[0-9]*://| sed -e s/\-.*$//` + echo "INFO: Debian packaging Version is $DEB_VERSION"; + VERSION="\"$DEB_VERSION\"" +fi + if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then VERSION="\"3.1.4\"" fi @@ -268,7 +276,7 @@ if test -z "$modulename" || test "$modul modulename=`pwd`; modulename=`basename $modulename` esc_VERSION=`echo $VERSION | sed -e "s#[^.0-9a-zA-Z]##g"` - modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` + modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"` fi if test -n "$kde_use_qt_param"; then diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/admin/detect-autoconf.sh kdemultimedia-3.1.4.19-4/admin/detect-autoconf.sh --- kdemultimedia-3.1.4/admin/detect-autoconf.sh 2003-07-13 21:29:15.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/admin/detect-autoconf.sh 2003-10-06 17:49:55.000000000 +0200 @@ -52,12 +52,12 @@ checkAutoheader() checkAutomakeAclocal () { if test -z "$UNSERMAKE"; then - if test -x "`$WHICH automake-1.6`" ; then + if test -x "`$WHICH automake-1.5`" ; then + AUTOMAKE="`$WHICH automake-1.5`" + ACLOCAL="`$WHICH aclocal-1.5`" + elif test -x "`$WHICH automake-1.6`" ; then AUTOMAKE="`$WHICH automake-1.6`" ACLOCAL="`$WHICH aclocal-1.6`" - elif test -x "`$WHICH automake-1.7`" ; then - AUTOMAKE="`$WHICH automake-1.7`" - ACLOCAL="`$WHICH aclocal-1.7`" fi else AUTOMAKE="$UNSERMAKE" diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/admin/install-sh kdemultimedia-3.1.4.19-4/admin/install-sh --- kdemultimedia-3.1.4/admin/install-sh 2003-09-02 03:17:17.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/admin/install-sh 2003-10-06 17:49:55.000000000 +0200 @@ -56,7 +56,7 @@ dir_arg="" while [ x"$1" != x ]; do case $1 in - -c) instcmd=$cpprog + -c) instcmd="$cpprog" shift continue;; @@ -79,7 +79,7 @@ while [ x"$1" != x ]; do shift continue;; - -s) stripcmd=$stripprog + -s) stripcmd="$stripprog" shift continue;; @@ -106,7 +106,7 @@ done if [ x"$src" = x ] then - echo "$0: no input file specified" >&2 + echo "install: no input file specified" exit 1 else : @@ -115,8 +115,8 @@ fi if [ x"$dir_arg" != x ]; then dst=$src src="" - - if [ -d "$dst" ]; then + + if [ -d $dst ]; then instcmd=: chmodcmd="" else @@ -125,20 +125,20 @@ if [ x"$dir_arg" != x ]; then else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad +# might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. if [ -f "$src" ] || [ -d "$src" ] then : else - echo "$0: $src does not exist" >&2 + echo "install: $src does not exist" exit 1 fi - + if [ x"$dst" = x ] then - echo "$0: no destination specified" >&2 + echo "install: no destination specified" exit 1 else : @@ -147,16 +147,16 @@ else # If destination is a directory, append the input filename; if your system # does not like double slashes in filenames, you may need to add some logic - if [ -d "$dst" ] + if [ -d $dst ] then - dst=$dst/`basename "$src"` + dst="$dst"/`basename $src` else : fi fi ## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. # this part is taken from Noah Friedman's mkinstalldirs script @@ -165,73 +165,69 @@ dstdir=`echo "$dst" | sed -e 's,[^/]*$,, if [ ! -d "$dstdir" ]; then defaultIFS=' ' -IFS="${IFS-$defaultIFS}" +IFS="${IFS-${defaultIFS}}" -oIFS=$IFS +oIFS="${IFS}" # Some sh's can't handle IFS=/ for some reason. IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS +set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +IFS="${oIFS}" pathcomp='' while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 + pathcomp="${pathcomp}${1}" shift - if [ ! -d "$pathcomp" ] ; + if [ ! -d "${pathcomp}" ] ; then - $mkdirprog "$pathcomp" + $mkdirprog "${pathcomp}" else : fi - pathcomp=$pathcomp/ + pathcomp="${pathcomp}/" done fi if [ x"$dir_arg" != x ] then - $doit $instcmd "$dst" && + $doit $instcmd $dst && - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi else # If we're going to rename the final executable, determine the name now. - if [ x"$transformarg" = x ] + if [ x"$transformarg" = x ] then - dstfile=`basename "$dst"` + dstfile=`basename $dst` else - dstfile=`basename "$dst" $transformbasename | + dstfile=`basename $dst $transformbasename | sed $transformarg`$transformbasename fi # don't allow the sed command to completely eliminate the filename - if [ x"$dstfile" = x ] + if [ x"$dstfile" = x ] then - dstfile=`basename "$dst"` + dstfile=`basename $dst` else : fi -# Make a couple of temp file names in the proper directory. +# Make a temp file name in the proper directory. dsttmp=$dstdir/#inst.$$# - rmtmp=$dstdir/#rm.$$# - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 # Move or copy the file name to the temp name - $doit $instcmd "$src" "$dsttmp" && + $doit $instcmd $src $dsttmp && + + trap "rm -f ${dsttmp}" 0 && # and set any options; do chmod last to preserve setuid bits @@ -239,38 +235,17 @@ else # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $instcmd $src $dsttmp" command. - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && + if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi && + if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi && + if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi && + if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi && # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + $doit $rmcmd -f $dstdir/$dstfile && + $doit $mvcmd $dsttmp $dstdir/$dstfile fi && -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit -} +exit 0 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/aktion/Makefile.am kdemultimedia-3.1.4.19-4/aktion/Makefile.am --- kdemultimedia-3.1.4/aktion/Makefile.am 2002-09-14 03:08:19.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/aktion/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -40,13 +40,9 @@ partdir = $(kde_datadir)/aktion part_DATA = aktion_part.rc # this is where the desktop file will go -lnkdir = $(kde_appsdir)/Multimedia/More +lnkdir = $(kde_appsdir)/Applications/Multimedia lnk_DATA = aktion.desktop -install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/aktion.desktop - rcdir = $(kde_confdir) rc_DATA = aktionrc diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/Makefile.am kdemultimedia-3.1.4.19-4/arts/builder/Makefile.am --- kdemultimedia-3.1.4/arts/builder/Makefile.am 2003-05-07 13:46:44.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -1,15 +1,11 @@ SUBDIRS = pics # just set the variable -APPSDIR = $(kde_appsdir)/Multimedia +APPSDIR = $(kde_appsdir)/Applications/Multimedia # set the include path for X, qt, KDE, mico and the synthesizer class defs INCLUDES= -I$(top_srcdir)/arts/runtime -I$(top_builddir)/arts/runtime -I$(kde_includes)/arts $(all_includes) applnk_DATA = artsbuilder.desktop -applnkdir = $(kde_appsdir)/Multimedia/More - -install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/artsbuilder.desktop +applnkdir = $(kde_appsdir)/Applications/Multimedia kdemime_DATA = x-artsbuilder.desktop kdemimedir = $(kde_mimedir)/application diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/artsbuilder.desktop kdemultimedia-3.1.4.19-4/arts/builder/artsbuilder.desktop --- kdemultimedia-3.1.4/arts/builder/artsbuilder.desktop 2003-09-02 12:46:49.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/artsbuilder.desktop 2003-09-30 20:26:07.000000000 +0200 @@ -2,7 +2,7 @@ [KDE Desktop Entry] Encoding=UTF-8 BinaryPattern=artsbuilder; -Name=aRts Builder +Name=Audio Builder Name[af]=Arts Builder Name[ar]=باني Arts Name[bg]=Звуков дизайнер aRts @@ -32,9 +32,8 @@ Name[ven]=Mufhati wa aRts Name[xh]=Umakhi we aRts Name[zh_CN]=aRts 创建程序 Name[zu]=Umakhi We aRts -GenericName=Audio Filter Designer +GenericName=Audio Builder GenericName[af]=Audio Filter Ontwerper -GenericName[bg]=Дизайнер на аудио филтри GenericName[bs]=Dizajner audio filtera GenericName[ca]=Dissenyador de filtres àudio GenericName[cs]=Návrhář zvukových filtrů @@ -43,7 +42,7 @@ GenericName[de]=Audiofilter-Designer GenericName[el]=Σχεδιαστής φίλτρων ήχου GenericName[es]=Diseñador de filtros de audio GenericName[et]=Audiofiltrite disainer -GenericName[fi]=Äänisuodattimien suunnitteluohjelma +GenericName[fi]=Äänisuodattimien suunitteluohjelma GenericName[fr]=Concepteur de filtre audio GenericName[he]=מעצב מסנני שמע GenericName[hu]=hangszűrő-tervező diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/autorouter.cpp kdemultimedia-3.1.4.19-4/arts/builder/autorouter.cpp --- kdemultimedia-3.1.4/arts/builder/autorouter.cpp 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/autorouter.cpp 2002-05-28 22:43:34.000000000 +0200 @@ -26,8 +26,6 @@ #include #include -#include - #ifndef HAVE_LIBPTHREAD #define pthread_create(a, b, c, d) ; #define pthread_join(a, b) ; @@ -59,14 +57,6 @@ bool ARCommand::isDestructive() AutoRouter::AutoRouter(int width, int height) : width(width), height(height) { -#ifdef HAVE_LIBPTHREAD - pthread_attr_t attrs; - - pthread_attr_init(&attrs); - pthread_mutex_init(&mutex_sync, 0); - pthread_mutex_init(&mutex_queue, 0); -#endif - // allocate memory for fields.. field = new Field*[width]; completeField = new Field*[width]; @@ -98,6 +88,12 @@ AutoRouter::AutoRouter(int width, int he thread_terminate_now = false; // not yet #ifdef HAVE_LIBPTHREAD + pthread_attr_t attrs; + + pthread_attr_init(&attrs); + pthread_mutex_init(&mutex_sync, 0); + pthread_mutex_init(&mutex_queue, 0); + // setup thread and run thread_command_loop() in it pthread_create(&route_thread, &attrs, startroute, this); #endif @@ -164,11 +160,13 @@ void AutoRouter::enqueue(ARCommand *comm // ok, then we can kill the whole list, since this will clear // the whole results anyway - command_queue.setAutoDelete(true); - command_queue.clear(); - command_queue.setAutoDelete(false); + while(command_queue.size() > 0) + { + delete *command_queue.begin(); + command_queue.pop_front(); + } } - command_queue.append(command); + command_queue.push_back(command); pthread_mutex_unlock(&mutex_queue); #else @@ -186,17 +184,14 @@ void AutoRouter::thread_command_loop() // pop one command from queue if possible.. pthread_mutex_lock(&mutex_queue); - if(!command_queue.isEmpty()) + if(command_queue.size() > 0) { - command = command_queue.first(); - command_queue.remove(unsigned(0)); + command = (*command_queue.begin()); + command_queue.pop_front(); } else { - if (thread_terminate_now) { - pthread_mutex_unlock(&mutex_queue); - return; - } + if(thread_terminate_now) return; } pthread_mutex_unlock(&mutex_queue); @@ -424,9 +419,8 @@ void AutoRouter::thread_connect(int x1, PathQueue& activePathList = pathlist[activelist]; - assert(activePathList.size()); - examinePath(activePathList.first()); - activePathList.pop_front(); + examinePath(activePathList.top()); + activePathList.pop(); numQueuedPaths--; } @@ -438,7 +432,7 @@ void AutoRouter::thread_connect(int x1, //arts_debug("bestGoalPath.history for this connection is %s", bestGoalPath.history.data()); //arts_debug("minCost for that was %d", gms); - const char *walk = bestGoalPath.history.ascii(); + const char *walk = bestGoalPath.history.c_str(); int x = x1; int y = y1; @@ -485,15 +479,14 @@ void AutoRouter::queuePath(const PathInf if(targetlist > 1023) targetlist = 1023; - pathlist[targetlist].append(newPath); - qHeapSort(pathlist[targetlist]); + pathlist[targetlist].push(newPath); numQueuedPaths++; } void AutoRouter::examinePath(const PathInfo &path) { - const char *walk = path.history.ascii(); + const char *walk = path.history.c_str(); // check if we can go here: diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/autorouter.h kdemultimedia-3.1.4.19-4/arts/builder/autorouter.h --- kdemultimedia-3.1.4/arts/builder/autorouter.h 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/autorouter.h 2002-05-28 22:43:34.000000000 +0200 @@ -1,4 +1,4 @@ -/* + /* Copyright (C) 1998 Stefan Westerfeld , 2002 Hans Meine @@ -33,19 +33,28 @@ #include #endif -#include -#include +#include +#include +#include +#include class PathInfo { public: int x1, x2, y1, y2, cost, depth; - QString history; - int operator<(const PathInfo& x) const { return cost < x.cost; } - int operator==(const PathInfo& x) const { return cost == x.cost; } + std::string history; }; -typedef QValueList PathQueue; +// functor for priority_queue +struct BetterPath: std::binary_function +{ + bool operator ()(const PathInfo &first, const PathInfo &second) + { + return first.cost > second.cost; + } +}; + +typedef std::priority_queue, BetterPath> PathQueue; class ARCommand; @@ -96,7 +105,7 @@ protected: pthread_t route_thread; #endif - QPtrList command_queue; + std::list command_queue; bool thread_terminate_now; /*************************/ diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/execdlg.cpp kdemultimedia-3.1.4.19-4/arts/builder/execdlg.cpp --- kdemultimedia-3.1.4/arts/builder/execdlg.cpp 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/execdlg.cpp 2003-11-15 03:27:07.000000000 +0100 @@ -196,6 +196,6 @@ void ExecDlg::saveSession() void ExecDlg::help() { - KApplication::kApplication()->invokeHelp("", "karts"); + KApplication::kApplication()->invokeHelp("", "artsbuilder"); } #include "execdlg.moc" diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/main.cpp kdemultimedia-3.1.4.19-4/arts/builder/main.cpp --- kdemultimedia-3.1.4/arts/builder/main.cpp 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/main.cpp 2003-02-03 16:33:01.000000000 +0100 @@ -659,7 +659,6 @@ void ArtsBuilderWindow::retrieve() void ArtsBuilderWindow::execute() { - assert(structure); assert(!execDlg); execDlg = new ExecDlg(0, structure); assert(execDlg); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/propertypanel.cpp kdemultimedia-3.1.4.19-4/arts/builder/propertypanel.cpp --- kdemultimedia-3.1.4/arts/builder/propertypanel.cpp 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/propertypanel.cpp 2002-05-28 22:43:38.000000000 +0200 @@ -38,7 +38,6 @@ PropertyPanel::PropertyPanel( QWidget* parent, const char* name, WFlags fl ) : PropertyPanelBase( parent, name, fl ), - component(0L), port(0L) { setTitleFont(); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/scomponent.cpp kdemultimedia-3.1.4.19-4/arts/builder/scomponent.cpp --- kdemultimedia-3.1.4/arts/builder/scomponent.cpp 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/scomponent.cpp 2002-05-28 22:43:42.000000000 +0200 @@ -26,7 +26,6 @@ #include StructureComponent::StructureComponent(StructureCanvas *canvas) -: _x(0), _y(0) { this->canvas = canvas; } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/builder/structure.cpp kdemultimedia-3.1.4.19-4/arts/builder/structure.cpp --- kdemultimedia-3.1.4/arts/builder/structure.cpp 2003-07-13 21:29:16.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/builder/structure.cpp 2002-07-03 18:28:56.000000000 +0200 @@ -25,7 +25,6 @@ #include #include #include -#include #include using namespace std; @@ -132,10 +131,6 @@ bool Structure::startExecute() /* create the structure on the server */ structure = Arts::DynamicCast(builder.createObject(remoteSD)); - - if (structure.isNull()) - return false; - structure.start(); return true; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/modules/monosimplemixerchannelguifactory_impl.cc kdemultimedia-3.1.4.19-4/arts/modules/monosimplemixerchannelguifactory_impl.cc --- kdemultimedia-3.1.4/arts/modules/monosimplemixerchannelguifactory_impl.cc 2003-09-09 01:40:21.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/modules/monosimplemixerchannelguifactory_impl.cc 2003-02-03 16:33:01.000000000 +0100 @@ -95,6 +95,6 @@ namespace Arts { } }; REGISTER_IMPLEMENTATION(MonoSimpleMixerChannelGuiFactory_impl); -} +}; // vim:ts=4:sw=4 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/modules/simplemixerchannelguifactory_impl.cc kdemultimedia-3.1.4.19-4/arts/modules/simplemixerchannelguifactory_impl.cc --- kdemultimedia-3.1.4/arts/modules/simplemixerchannelguifactory_impl.cc 2003-09-09 01:40:21.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/modules/simplemixerchannelguifactory_impl.cc 2003-02-03 16:33:01.000000000 +0100 @@ -90,7 +90,7 @@ namespace Arts { } }; REGISTER_IMPLEMENTATION(SimpleMixerChannelGuiFactory_impl); -} +}; // vim:ts=4:sw=4 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/modules/synth_stereo_fir_equalizer_impl.cc kdemultimedia-3.1.4.19-4/arts/modules/synth_stereo_fir_equalizer_impl.cc --- kdemultimedia-3.1.4/arts/modules/synth_stereo_fir_equalizer_impl.cc 2003-09-09 01:40:21.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/modules/synth_stereo_fir_equalizer_impl.cc 2003-02-03 16:33:01.000000000 +0100 @@ -215,4 +215,4 @@ Widget StereoFirEqualizerGuiFactory_impl vbox._addChild(g,"g"); return vbox; -} +}; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/tools/Makefile.am kdemultimedia-3.1.4.19-4/arts/tools/Makefile.am --- kdemultimedia-3.1.4/arts/tools/Makefile.am 2003-05-07 13:46:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/tools/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -22,12 +22,7 @@ rcdir = $(kde_datadir)/artscontrol rc_DATA = artscontrol.rc artsmidimanagerview.rc applnk_DATA = artscontrol.desktop -applnkdir = $(kde_appsdir)/Multimedia/More - -install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/artscontrol.desktop - +applnkdir = $(kde_appsdir)/Applications/Multimedia METASOURCES = AUTO diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/arts/tools/artscontrol.desktop kdemultimedia-3.1.4.19-4/arts/tools/artscontrol.desktop --- kdemultimedia-3.1.4/arts/tools/artscontrol.desktop 2003-07-13 21:29:19.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/arts/tools/artscontrol.desktop 2003-09-30 20:26:07.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 BinaryPattern=artscontrol; -Name=aRts Control Tool +Name=Sound Server Control Name[af]=Arts Kontrole Program Name[ar]=أداة aRts للتحكم Name[bg]=Контролен панел на aRts @@ -48,7 +48,6 @@ Name[zh_TW]=aRts 控制工具 Name[zu]=Ithuluazi Lokuphatha le aRts GenericName=Sound Server Control GenericName[af]=Klank Bediener Kontrole -GenericName[bg]=Контрол на звуковия сървър GenericName[bs]=Kontrola sound servera GenericName[ca]=Control del servidor de so GenericName[cs]=Ovládání zvukového serveru diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/audiofile_artsplugin/.cvsignore kdemultimedia-3.1.4.19-4/audiofile_artsplugin/.cvsignore --- kdemultimedia-3.1.4/audiofile_artsplugin/.cvsignore 2003-07-13 21:29:20.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/audiofile_artsplugin/.cvsignore 2002-06-03 19:53:42.000000000 +0200 @@ -1,5 +1,4 @@ Makefile Makefile.in Makefile.rules.in -audiofilearts.cpp -audiofilearts.h +audiofilearts.* diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/.cvsignore kdemultimedia-3.1.4.19-4/debian/.cvsignore --- kdemultimedia-3.1.4/debian/.cvsignore 2002-06-25 01:32:34.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/.cvsignore 2003-03-26 21:43:07.000000000 +0100 @@ -1,24 +1,29 @@ -debiandirs -files *.postinst.debhelper *.postrm.debhelper *.prerm.debhelper *.substvars -kdemultimedia -kdemultimedia-dev +aktion artsbuilder +debiandirs +files +k3b kaboodle +kaudiocreator +kdemultimedia +kdemultimedia-dev +kdemultimedia-kfile-plugins +kdemultimedia-kio-plugins kfile-audio-plugins +kio-audio-protocols kmid kmidi kmix +kreatecd +krec kscd libarts1-audiofile libarts1-mpeglib +libarts1-xine mpeglib noatun -k3b -aktion -kio-audio-protocols -kaudiocreator -kreatecd +tmp diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/.xba.last kdemultimedia-3.1.4.19-4/debian/.xba.last --- kdemultimedia-3.1.4/debian/.xba.last 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/.xba.last 2004-03-10 12:09:21.000000000 +0100 @@ -0,0 +1 @@ +kdemultimedia 4:3.1.4.19-4 '2004/03/10 11:34:42' '$Date$' diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/.xba.last.build-depends kdemultimedia-3.1.4.19-4/debian/.xba.last.build-depends --- kdemultimedia-3.1.4/debian/.xba.last.build-depends 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/.xba.last.build-depends 2004-03-10 12:09:21.000000000 +0100 @@ -0,0 +1,10 @@ +kdelibs4-dev 4:3.1.4.45-1 +libcdparanoia0-dev 3a9.8-10 +libxine-dev 1-beta12-1 +cdparanoia 3a9.8-10 +gettext 0.12.1-7 +automake1.7 1.7.8-1 +libxaw7-dev 4.3.0.x1-2 +debhelper 4.1.74 +gawk 1:3.1.3-2 +texinfo 4.6-1 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/.xba.timeflag kdemultimedia-3.1.4.19-4/debian/.xba.timeflag --- kdemultimedia-3.1.4/debian/.xba.timeflag 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/.xba.timeflag 2004-03-10 12:34:42.000000000 +0100 @@ -0,0 +1 @@ +'$Date: 2004/03/10 11:34:42 $' diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/artsbuilder.install kdemultimedia-3.1.4.19-4/debian/artsbuilder.install --- kdemultimedia-3.1.4/debian/artsbuilder.install 2002-10-31 06:22:09.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/artsbuilder.install 2003-09-22 02:10:06.000000000 +0200 @@ -88,10 +88,8 @@ debian/tmp/usr/lib/mcop/artsmidi.mcopcla debian/tmp/usr/lib/mcop/artsmidi.mcoptype debian/tmp/usr/lib/mcop/artsmodules.mcopclass debian/tmp/usr/lib/mcop/artsmodules.mcoptype -debian/tmp/usr/share/applnk/Multimedia/More/artsbuilder.desktop -debian/tmp/usr/share/applnk/Multimedia/More/artscontrol.desktop -debian/tmp/usr/share/applnk/Multimedia/artsbuilder.desktop -debian/tmp/usr/share/applnk/Multimedia/artscontrol.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/artsbuilder.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/artscontrol.desktop debian/tmp/usr/share/apps/artsbuilder/artsbuilderui.rc debian/tmp/usr/share/apps/artsbuilder/examples/README debian/tmp/usr/share/apps/artsbuilder/examples/example_adsr.arts diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/changelog kdemultimedia-3.1.4.19-4/debian/changelog --- kdemultimedia-3.1.4/debian/changelog 2003-07-13 21:29:20.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/changelog 2004-03-10 12:09:21.000000000 +0100 @@ -1,3 +1,570 @@ +kdemultimedia (4:3.1.4.19-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.44-1 => 4:3.1.4.45-1)). + + -- Autobuilder Wed, 10 Mar 2004 06:09:21 -0500 + +kdemultimedia (4:3.1.4.19-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.43-1 => 4:3.1.4.44-1)). + + -- Autobuilder Wed, 25 Feb 2004 03:50:11 -0500 + +kdemultimedia (4:3.1.4.19-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.42-1 => 4:3.1.4.43-1)). + + -- Autobuilder Thu, 19 Feb 2004 03:46:11 -0500 + +kdemultimedia (4:3.1.4.19-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.41-1 => + 4:3.1.4.42-1)). + + -- Autobuilder Fri, 6 Feb 2004 02:26:30 -0500 + +kdemultimedia (4:3.1.4.18-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.40-1 => + 4:3.1.4.41-1)). + + -- Autobuilder Fri, 30 Jan 2004 03:21:57 -0500 + +kdemultimedia (4:3.1.4.17-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.39-1 => 4:3.1.4.40-1)). + + -- Autobuilder Tue, 16 Dec 2003 03:02:59 -0500 + +kdemultimedia (4:3.1.4.17-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.38-1 => + 4:3.1.4.39-1)). + + -- Autobuilder Wed, 26 Nov 2003 02:46:50 -0500 + +kdemultimedia (4:3.1.4.16-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, CVS + packaging changes, Build dependency changes: changed: kdelibs4-dev + (4:3.1.4.37-1 => 4:3.1.4.38-1)). + + -- Autobuilder Tue, 25 Nov 2003 02:43:13 -0500 + +kdemultimedia (4:3.1.4.15-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.36-1 => 4:3.1.4.37-1)). + + -- Autobuilder Sat, 22 Nov 2003 02:44:19 -0500 + +kdemultimedia (4:3.1.4.15-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.35-1 => 4:3.1.4.36-1)). + + -- Autobuilder Fri, 21 Nov 2003 02:43:07 -0500 + +kdemultimedia (4:3.1.4.15-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.34-1 => 4:3.1.4.35-1)). + + -- Autobuilder Thu, 20 Nov 2003 02:43:06 -0500 + +kdemultimedia (4:3.1.4.15-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.33-1 => + 4:3.1.4.34-1)). + + -- Autobuilder Wed, 19 Nov 2003 02:41:33 -0500 + +kdemultimedia (4:3.1.4.14-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.32-1 => + 4:3.1.4.33-1)). + + -- Autobuilder Tue, 18 Nov 2003 02:38:44 -0500 + +kdemultimedia (4:3.1.4.13-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes). + + -- Autobuilder Fri, 14 Nov 2003 23:06:07 -0500 + +kdemultimedia (4:3.1.4.12-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.31-1 => 4:3.1.4.32-1)). + + -- Autobuilder Fri, 14 Nov 2003 02:32:19 -0500 + +kdemultimedia (4:3.1.4.12-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.30-1 => + 4:3.1.4.31-1)). + + -- Autobuilder Thu, 13 Nov 2003 02:36:20 -0500 + +kdemultimedia (4:3.1.4.11-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.29-1 => + 4:3.1.4.30-1)). + + -- Autobuilder Wed, 12 Nov 2003 02:33:00 -0500 + +kdemultimedia (4:3.1.4.10-8) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.28-1 => 4:3.1.4.29-1)). + + -- Autobuilder Tue, 11 Nov 2003 02:26:19 -0500 + +kdemultimedia (4:3.1.4.10-7) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.27-1 => 4:3.1.4.28-1)). + + -- Autobuilder Sat, 8 Nov 2003 02:26:06 -0500 + +kdemultimedia (4:3.1.4.10-6) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.25-1 => 4:3.1.4.27-1)). + + -- Autobuilder Fri, 7 Nov 2003 17:04:31 -0500 + +kdemultimedia (4:3.1.4.10-5) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.24-1 => 4:3.1.4.25-1)). + + -- Autobuilder Thu, 6 Nov 2003 04:51:01 -0500 + +kdemultimedia (4:3.1.4.10-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.23-1 => 4:3.1.4.24-1)). + + -- Autobuilder Wed, 5 Nov 2003 02:27:59 -0500 + +kdemultimedia (4:3.1.4.10-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.22-1 => 4:3.1.4.23-1)). + + -- Autobuilder Tue, 4 Nov 2003 02:33:36 -0500 + +kdemultimedia (4:3.1.4.10-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.21-1 => 4:3.1.4.22-1)). + + -- Autobuilder Mon, 3 Nov 2003 02:23:20 -0500 + +kdemultimedia (4:3.1.4.10-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes). + + -- Autobuilder Sat, 1 Nov 2003 23:05:07 -0500 + +kdemultimedia (4:3.1.4.9-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.20-1 => 4:3.1.4.21-1)). + + -- Autobuilder Sat, 1 Nov 2003 02:22:58 -0500 + +kdemultimedia (4:3.1.4.9-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.17-1 => + 4:3.1.4.20-1)). + + -- Autobuilder Fri, 31 Oct 2003 18:09:05 -0500 + +kdemultimedia (4:3.1.4.8-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.16-2 => 4:3.1.4.17-1)). + + -- Autobuilder Wed, 29 Oct 2003 03:59:26 -0500 + +kdemultimedia (4:3.1.4.8-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.16-1 => 4:3.1.4.16-2), changed: + gettext (0.12.1-6 => 0.12.1-7), changed: automake1.7 (1.7.7-1 => + 1.7.8-1), changed: debhelper (4.1.73 => 4.1.74)). + + -- Autobuilder Mon, 27 Oct 2003 18:39:47 -0500 + +kdemultimedia (4:3.1.4.8-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.15-1 => 4:3.1.4.16-1)). + + -- Autobuilder Sun, 26 Oct 2003 02:29:36 -0500 + +kdemultimedia (4:3.1.4.8-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.14-1 => + 4:3.1.4.15-1)). + + -- Autobuilder Sat, 25 Oct 2003 03:37:08 -0400 + +kdemultimedia (4:3.1.4.7-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes). + + -- Autobuilder Thu, 23 Oct 2003 00:30:57 -0400 + +kdemultimedia (4:3.1.4.6-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, CVS + packaging changes, Build dependency changes: changed: kdelibs4-dev + (4:3.1.4.13-1 => 4:3.1.4.14-1)). + + -- Autobuilder Sun, 19 Oct 2003 03:26:37 -0400 + +kdemultimedia (4:3.1.4.5-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.12-1 => 4:3.1.4.13-1)). + + -- Autobuilder Sat, 18 Oct 2003 03:46:08 -0400 + +kdemultimedia (4:3.1.4.5-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.11-1 => + 4:3.1.4.12-1)). + + -- Autobuilder Fri, 17 Oct 2003 04:11:21 -0400 + +kdemultimedia (4:3.1.4.4-6) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.9-1 => 4:3.1.4.11-1)). + + -- Autobuilder Thu, 16 Oct 2003 03:21:29 -0400 + +kdemultimedia (4:3.1.4.4-5) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.7-1 => 4:3.1.4.9-1)). + + -- Autobuilder Wed, 15 Oct 2003 03:17:55 -0400 + +kdemultimedia (4:3.1.4.4-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.8-2 => 4:3.1.4.7-1)). + + -- Autobuilder Sun, 12 Oct 2003 03:29:57 -0400 + +kdemultimedia (4:3.1.4.4-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.8-1 => 4:3.1.4.8-2)). + + -- Autobuilder Sat, 11 Oct 2003 15:02:53 -0400 + +kdemultimedia (4:3.1.4.4-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.7-1 => 4:3.1.4.8-1), changed: + libcdparanoia0-dev (3a9.8-7 => 3a9.8-10), changed: cdparanoia + (3a9.8-7 => 3a9.8-10), changed: gettext (0.12.1-3 => 0.12.1-6), + changed: automake1.7 (1.7.6-3 => 1.7.7-1), changed: debhelper + (4.1.52 => 4.1.73), changed: gawk (1:3.1.3-1 => 1:3.1.3-2)). + + -- Autobuilder Sat, 11 Oct 2003 05:12:32 -0400 + +kdemultimedia (4:3.1.4.4-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.6-1 => 4:3.1.4.7- + 1)). + + -- Autobuilder Fri, 10 Oct 2003 04:21:45 -0400 + +kdemultimedia (4:3.1.4.3-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.4.5-1 => 4:3.1.4.6-1)). + + -- Autobuilder Thu, 9 Oct 2003 04:22:22 -0400 + +kdemultimedia (4:3.1.4.3-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.4-1 => 4:3.1.4.5- + 1)). + + -- Autobuilder Wed, 8 Oct 2003 03:25:04 -0400 + +kdemultimedia (4:3.1.4.2-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.3-1 => 4:3.1.4.4- + 1)). + + -- Autobuilder Tue, 7 Oct 2003 03:32:42 -0400 + +kdemultimedia (4:3.1.4.1-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.2-1 => 4:3.1.4.3- + 1)). + + -- Autobuilder Mon, 6 Oct 2003 03:24:33 -0400 + +kdemultimedia (4:3.1.4.0-1) unstable; urgency=low + + * merge with KDE 3.1.4 release + + -- Xandros Corporation Sat, 4 Oct 2003 20:22:00 -0400 + +kdemultimedia (4:3.1.2.12-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.4.0-1 => 4:3.1.4.1- + 1)). + + -- Autobuilder Fri, 3 Oct 2003 03:35:20 -0400 + +kdemultimedia (4:3.1.2.11-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.23-1 => + 4:3.1.4.0-1)). + + -- Autobuilder Thu, 2 Oct 2003 04:09:13 -0400 + +kdemultimedia (4:3.1.2.10-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.22-1 => + 4:3.1.3.23-1)). + + -- Autobuilder Wed, 1 Oct 2003 03:27:45 -0400 + +kdemultimedia (4:3.1.2.9-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.21-1 => 4:3.1.3.22-1)). + + -- Autobuilder Tue, 30 Sep 2003 03:26:15 -0400 + +kdemultimedia (4:3.1.2.9-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.20-1 => + 4:3.1.3.21-1)). + + -- Autobuilder Mon, 29 Sep 2003 03:35:31 -0400 + +kdemultimedia (4:3.1.2.8-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.19-1 => + 4:3.1.3.20-1)). + + -- Autobuilder Sat, 27 Sep 2003 03:24:13 -0400 + +kdemultimedia (4:3.1.2.7-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.18-1 => 4:3.1.3.19-1)). + + -- Autobuilder Fri, 26 Sep 2003 03:24:39 -0400 + +kdemultimedia (4:3.1.2.7-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.17-1 => 4:3.1.3.18-1)). + + -- Autobuilder Wed, 24 Sep 2003 03:42:28 -0400 + +kdemultimedia (4:3.1.2.7-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.16-2 => + 4:3.1.3.17-1)). + + -- Autobuilder Tue, 23 Sep 2003 16:42:47 -0400 + +kdemultimedia (4:3.1.2.6-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.16-1 => 4:3.1.3.16-2), changed: + automake1.7 (1.7.6-1 => 1.7.6-3)). + + -- Autobuilder Tue, 23 Sep 2003 00:37:37 -0400 + +kdemultimedia (4:3.1.2.6-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, CVS + packaging changes, Build dependency changes: changed: kdelibs4-dev + (4:3.1.3.15-1 => 4:3.1.3.16-1)). + + -- Autobuilder Mon, 22 Sep 2003 03:55:58 -0400 + +kdemultimedia (4:3.1.2.5-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.14-1 => + 4:3.1.3.15-1)). + + -- Autobuilder Sun, 21 Sep 2003 04:59:29 -0400 + +kdemultimedia (4:3.1.2.4-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes). + + -- Autobuilder Fri, 19 Sep 2003 23:33:02 -0400 + +kdemultimedia (4:3.1.2.3-6) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.13-1 => 4:3.1.3.14-1)). + + -- Autobuilder Fri, 19 Sep 2003 03:25:10 -0400 + +kdemultimedia (4:3.1.2.3-5) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.12-1 => 4:3.1.3.13-1)). + + -- Autobuilder Wed, 17 Sep 2003 02:29:10 -0400 + +kdemultimedia (4:3.1.2.3-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.11-2 => 4:3.1.3.12-1)). + + -- Autobuilder Tue, 16 Sep 2003 03:23:16 -0400 + +kdemultimedia (4:3.1.2.3-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.11-1 => 4:3.1.3.11-2)). + + -- Autobuilder Sat, 13 Sep 2003 03:18:59 -0400 + +kdemultimedia (4:3.1.2.3-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.10-1 => 4:3.1.3.11-1)). + + -- Autobuilder Fri, 12 Sep 2003 15:56:43 -0400 + +kdemultimedia (4:3.1.2.3-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.9-1 => + 4:3.1.3.10-1)). + + -- Autobuilder Fri, 12 Sep 2003 03:17:19 -0400 + +kdemultimedia (4:3.1.2.2-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.8-1 => 4:3.1.3.9-1)). + + -- Autobuilder Thu, 11 Sep 2003 03:17:24 -0400 + +kdemultimedia (4:3.1.2.2-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.7-1 => 4:3.1.3.8- + 1)). + + -- Autobuilder Wed, 10 Sep 2003 03:19:45 -0400 + +kdemultimedia (4:3.1.2.1-1) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): CVS code changes, Build + dependency changes: changed: kdelibs4-dev (4:3.1.3.6-1 => 4:3.1.3.7- + 1)). + + -- Autobuilder Tue, 9 Sep 2003 00:15:55 -0400 + +kdemultimedia (4:3.1.2.0-9) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.5-2 => 4:3.1.3.6-1)). + + -- Autobuilder Sat, 6 Sep 2003 00:16:56 -0400 + +kdemultimedia (4:3.1.2.0-8) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.5-1 => 4:3.1.3.5-2)). + + -- Autobuilder Thu, 4 Sep 2003 18:24:01 -0400 + +kdemultimedia (4:3.1.2.0-7) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.4-1 => 4:3.1.3.5-1)). + + -- Autobuilder Thu, 4 Sep 2003 00:14:10 -0400 + +kdemultimedia (4:3.1.2.0-6) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.3-1 => 4:3.1.3.4-1)). + + -- Autobuilder Tue, 2 Sep 2003 17:14:58 -0400 + +kdemultimedia (4:3.1.2.0-5) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.2-2 => 4:3.1.3.3-1)). + + -- Autobuilder Mon, 1 Sep 2003 00:13:38 -0400 + +kdemultimedia (4:3.1.2.0-4) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.1-1 => 4:3.1.3.2-2)). + + -- Autobuilder Thu, 28 Aug 2003 20:51:51 -0400 + +kdemultimedia (4:3.1.2.0-3) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.3.0-1 => 4:3.1.3.1-1)). + + -- Autobuilder Thu, 21 Aug 2003 23:58:55 -0400 + +kdemultimedia (4:3.1.2.0-2) unstable; urgency=low + + * AutoBuilder version increment (Reason(s): Build dependency changes: + changed: kdelibs4-dev (4:3.1.2.1-1 => 4:3.1.3.0-1)). + + -- Autobuilder Tue, 19 Aug 2003 23:50:19 -0400 + +kdemultimedia (4:3.1.2.0-1) unstable; urgency=low + + * Initial Xandros release version + + -- Xandros Desktop User Wed, 13 Aug 2003 15:35:26 -0400 + kdemultimedia (4:3.1.2-1) unstable; urgency=low * New upstream release. @@ -18,24 +585,6 @@ kdemultimedia (4:3.1.0-1) unstable; urge -- Christopher L Cheney Tue, 04 Feb 2003 23:00:00 -0600 -kdemultimedia (4:2.2.2-8.2) stable-security; urgency=high - - * Non-maintainer upload by the Security Team - * Added special detection routine for big/little endianess on MIPS since - the line "byteorder : {big|little} endian" from /proc/cpuinfo was - removed as of Linux 2.4.20, resulting in the mipsel buildd being - unable to build this package. - - -- Martin Schulze Wed, 22 Jan 2003 15:00:51 +0100 - -kdemultimedia (4:2.2.2-8.1) stable-security; urgency=high - - * Non-maintainer upload by the Security Team - * Applied upstream patches to fix several potential vulnerabilities. - http://www.kde.org/info/security/advisory-20021220-1.txt - - -- Martin Schulze Mon, 6 Jan 2003 08:53:19 +0100 - kdemultimedia (4:2.2.2-8) unstable; urgency=high * Updated Build-Depends (Closes: #132015) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/control kdemultimedia-3.1.4.19-4/debian/control --- kdemultimedia-3.1.4/debian/control 2003-07-13 21:29:20.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/control 2004-03-10 12:08:47.000000000 +0100 @@ -1,7 +1,7 @@ Source: kdemultimedia Section: kde Priority: optional -Maintainer: Christopher L Cheney +Maintainer: Xandros Corporation Build-Depends: automake1.7, cdparanoia, debhelper (>> 4.0.18), gawk, gettext, kdelibs4-dev, libcdparanoia0-dev, libxaw7-dev, libxine-dev, texinfo Standards-Version: 3.5.10.0 @@ -138,3 +138,4 @@ Depends: ${shlibs:Depends} Suggests: noatun-plugins Description: Media player (for video and audio) Media player (for video and audio) for KDE + diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kaboodle.install kdemultimedia-3.1.4.19-4/debian/kaboodle.install --- kdemultimedia-3.1.4/debian/kaboodle.install 2003-09-02 03:17:22.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/kaboodle.install 2003-09-22 02:10:06.000000000 +0200 @@ -3,8 +3,7 @@ debian/tmp/usr/lib/kaboodle.la debian/tmp/usr/lib/kaboodle.so debian/tmp/usr/lib/kde3/libkaboodlepart.la debian/tmp/usr/lib/kde3/libkaboodlepart.so -debian/tmp/usr/share/applnk/Multimedia/More/kaboodle.desktop -debian/tmp/usr/share/applnk/Multimedia/kaboodle.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/kaboodle.desktop debian/tmp/usr/share/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png debian/tmp/usr/share/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png debian/tmp/usr/share/apps/kaboodle/kaboodlepartui.rc @@ -17,4 +16,3 @@ debian/tmp/usr/share/icons/crystalsvg/32 debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kaboodle.png debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kaboodle.png debian/tmp/usr/share/services/kaboodle_component.desktop -debian/tmp/usr/share/services/kaboodleengine.desktop diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kaudiocreator.install kdemultimedia-3.1.4.19-4/debian/kaudiocreator.install --- kdemultimedia-3.1.4/debian/kaudiocreator.install 2003-05-07 13:46:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/kaudiocreator.install 2003-03-26 21:41:27.000000000 +0100 @@ -1,5 +1,5 @@ debian/tmp/usr/bin/kaudiocreator -debian/tmp/usr/share/applnk/Multimedia/kaudiocreator.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/kaudiocreator.desktop debian/tmp/usr/share/apps/kaudiocreator/kaudiocreatorui.rc debian/tmp/usr/share/apps/kaudiocreator/pics/check.png debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kaudiocreator.png diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kdemultimedia-kio-plugins.install kdemultimedia-3.1.4.19-4/debian/kdemultimedia-kio-plugins.install --- kdemultimedia-3.1.4/debian/kdemultimedia-kio-plugins.install 2003-02-05 10:18:13.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/kdemultimedia-kio-plugins.install 2003-11-25 02:39:21.000000000 +0100 @@ -3,4 +3,5 @@ debian/tmp/usr/lib/kde3/kcm_audiocd.so debian/tmp/usr/lib/kde3/kio_audiocd.la debian/tmp/usr/lib/kde3/kio_audiocd.so debian/tmp/usr/share/applnk/Settings/Sound/audiocd.desktop +debian/tmp/usr/share/doc/kde/HTML/en/kcontrol/kcmaudiocd debian/tmp/usr/share/services/audiocd.protocol diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kmid.install kdemultimedia-3.1.4.19-4/debian/kmid.install --- kdemultimedia-3.1.4/debian/kmid.install 2002-10-31 06:22:09.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/kmid.install 2003-09-22 02:10:06.000000000 +0200 @@ -1,8 +1,7 @@ debian/tmp/usr/bin/kmid debian/tmp/usr/lib/kde3/libkmidpart.la debian/tmp/usr/lib/kde3/libkmidpart.so -debian/tmp/usr/share/applnk/Multimedia/More/kmid.desktop -debian/tmp/usr/share/applnk/Multimedia/kmid.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/kmid.desktop debian/tmp/usr/share/apps/kmid/DiesIrae.kar debian/tmp/usr/share/apps/kmid/Guantanamera.kar debian/tmp/usr/share/apps/kmid/MariaDeLasMercedes.kar diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kmidi.install kdemultimedia-3.1.4.19-4/debian/kmidi.install --- kdemultimedia-3.1.4/debian/kmidi.install 2003-05-07 13:46:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/kmidi.install 2003-09-22 02:10:06.000000000 +0200 @@ -1,7 +1,6 @@ debian/tmp/usr/bin/kmidi debian/tmp/usr/bin/sf2cfg -debian/tmp/usr/share/applnk/Multimedia/More/kmidi.desktop -debian/tmp/usr/share/applnk/Multimedia/kmidi.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/kmidi.desktop debian/tmp/usr/share/apps/kmidi/* debian/tmp/usr/share/doc/kde/HTML/en/kmidi debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kmidi.png diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kmix.install kdemultimedia-3.1.4.19-4/debian/kmix.install --- kdemultimedia-3.1.4/debian/kmix.install 2003-05-07 13:46:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/kmix.install 2003-03-26 21:41:27.000000000 +0100 @@ -9,7 +9,7 @@ debian/tmp/usr/lib/kmix.so debian/tmp/usr/lib/kmixctrl.la debian/tmp/usr/lib/kmixctrl.so debian/tmp/usr/share/applnk/.hidden/kmixcfg.desktop -debian/tmp/usr/share/applnk/Multimedia/kmix.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/kmix.desktop debian/tmp/usr/share/apps/kicker/applets/kmixapplet.desktop debian/tmp/usr/share/apps/kmix/kmixui.rc debian/tmp/usr/share/apps/kmix/pics/kmixdocked.png diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/krec.install kdemultimedia-3.1.4.19-4/debian/krec.install --- kdemultimedia-3.1.4/debian/krec.install 2002-10-31 06:22:09.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/krec.install 2003-10-18 23:30:53.000000000 +0200 @@ -1,7 +1,7 @@ debian/tmp/usr/bin/krec debian/tmp/usr/lib/krec.la debian/tmp/usr/lib/krec.so -debian/tmp/usr/share/applnk/Multimedia/krec.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/krec.desktop debian/tmp/usr/share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png debian/tmp/usr/share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png debian/tmp/usr/share/apps/krec/icons/crystalsvg/32x32/actions/krec_record.png @@ -11,4 +11,7 @@ debian/tmp/usr/share/apps/krec/icons/cry debian/tmp/usr/share/apps/krec/krecui.rc debian/tmp/usr/share/apps/krec/tips debian/tmp/usr/share/doc/kde/HTML/en/krec +debian/tmp/usr/share/icons/crystalsvg/16x16/apps/krec.png +debian/tmp/usr/share/icons/crystalsvg/22x22/apps/krec.png +debian/tmp/usr/share/icons/crystalsvg/32x32/apps/krec.png debian/tmp/usr/share/icons/crystalsvg/48x48/apps/krec.png diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/kscd.install kdemultimedia-3.1.4.19-4/debian/kscd.install --- kdemultimedia-3.1.4/debian/kscd.install 2002-10-31 06:22:09.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/debian/kscd.install 2003-02-12 21:09:43.000000000 +0100 @@ -1,7 +1,7 @@ debian/tmp/usr/bin/kscd debian/tmp/usr/bin/workman2cddb.pl debian/tmp/usr/lib/libworkman.so.* -debian/tmp/usr/share/applnk/Multimedia/kscd.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/kscd.desktop debian/tmp/usr/share/apps/kscd/pics/cdsmall.xpm debian/tmp/usr/share/apps/kscd/pics/kscdlogo.xpm debian/tmp/usr/share/doc/kde/HTML/en/kscd diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/noatun.install kdemultimedia-3.1.4.19-4/debian/noatun.install --- kdemultimedia-3.1.4/debian/noatun.install 2003-05-07 13:46:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/noatun.install 2003-02-12 21:09:43.000000000 +0100 @@ -69,7 +69,7 @@ debian/tmp/usr/lib/mcop/noatunarts.mcopc debian/tmp/usr/lib/mcop/noatunarts.mcoptype debian/tmp/usr/lib/mcop/winskinvis.mcopclass debian/tmp/usr/lib/mcop/winskinvis.mcoptype -debian/tmp/usr/share/applnk/Multimedia/noatun.desktop +debian/tmp/usr/share/applnk/Applications/Multimedia/noatun.desktop debian/tmp/usr/share/apps/kconf_update/noatun.upd debian/tmp/usr/share/apps/kconf_update/noatun20update debian/tmp/usr/share/apps/noatun/dcopiface.plugin diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/debian/rules kdemultimedia-3.1.4.19-4/debian/rules --- kdemultimedia-3.1.4/debian/rules 2003-07-13 21:29:21.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/debian/rules 2003-06-25 17:01:53.000000000 +0200 @@ -15,7 +15,7 @@ export DH_COMPAT=4 export DH_OPTIONS # These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) +# # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/doc/kcontrol/kcmaudiocd/.cvsignore kdemultimedia-3.1.4.19-4/doc/kcontrol/kcmaudiocd/.cvsignore --- kdemultimedia-3.1.4/doc/kcontrol/kcmaudiocd/.cvsignore 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/doc/kcontrol/kcmaudiocd/.cvsignore 2003-11-25 02:39:21.000000000 +0100 @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/doc/kcontrol/kcmaudiocd/Makefile.am kdemultimedia-3.1.4.19-4/doc/kcontrol/kcmaudiocd/Makefile.am --- kdemultimedia-3.1.4/doc/kcontrol/kcmaudiocd/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/doc/kcontrol/kcmaudiocd/Makefile.am 2003-11-25 02:39:21.000000000 +0100 @@ -0,0 +1,2 @@ +KDE_LANG=en +KDE_DOCS=kcontrol/kcmaudiocd diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/doc/kcontrol/kcmaudiocd/index.docbook kdemultimedia-3.1.4.19-4/doc/kcontrol/kcmaudiocd/index.docbook --- kdemultimedia-3.1.4/doc/kcontrol/kcmaudiocd/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/doc/kcontrol/kcmaudiocd/index.docbook 2004-01-29 17:56:42.000000000 +0100 @@ -0,0 +1,78 @@ + + + + +]> + + + + +Music Encoding + + + +Xandros Documentation Team + + + + + + +2003-2004 +Xandros Corporation + + +2003-11-24 +2.0 + + + +The Music Encoding panel lets you set input information sources for CDs and music. + + + + +Music Encoding + + + + + + + +Music Encoding + +You can specify if CD information is automatically displayed from external Web sites when playing a CD. For example, when you insert a music CD into a CD-ROM drive, the name and picture of the CD, the name of the tracks, artist information, ratings, reviews, and other information can be automatically displayed. +The default settings allow such information to be displayed. Use the information outlined here if you change the settings and need to enable them again. +In these settings, CDDA refers to compact disc digital audio, Ogg Vorbis refers to a non-proprietary compressed music format similar to the proprietary MP3 format, and CDDB refers to compact disc database, which contains information, such as artist names and song titles for music CDs. + +To enable multimedia input + + +Click Launch, Control Center. +Click Sound, and click Music Encoding. +Click the Ogg Vorbis Settings tab. +Enable the Add track information check box to automatically display information for MP3 files. +Click the CDDB Settings tab. +Enable the Enable CDDB lookups check box to automatically display information for CD-ROM tracks (requires Internet access when in use). +Enable the Save remote CDDB entries to local files check box to save the displayed information to local files after downloading. +Click Apply. + + +You can also specify multimedia inputs in the CD Player application. + + + + + + \ No newline at end of file diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kaboodle/Makefile.am kdemultimedia-3.1.4.19-4/kaboodle/Makefile.am --- kdemultimedia-3.1.4/kaboodle/Makefile.am 2003-07-13 21:29:27.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kaboodle/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -37,13 +37,9 @@ dummy.cpp: echo > dummy.cpp applnk_DATA = kaboodle.desktop -applnkdir = $(kde_appsdir)/Multimedia - -install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia/More - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/More/kaboodle.desktop +applnkdir = $(kde_appsdir)/Applications/Multimedia -kde_services_DATA = kaboodle_component.desktop kaboodleengine.desktop +kde_services_DATA = kaboodle_component.desktop data_DATA = kaboodleui.rc kaboodlepartui.rc datadir = $(kde_datadir)/kaboodle diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kaboodle/kaboodleapp.cpp kdemultimedia-3.1.4.19-4/kaboodle/kaboodleapp.cpp --- kdemultimedia-3.1.4/kaboodle/kaboodleapp.cpp 2003-09-02 03:17:39.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kaboodle/kaboodleapp.cpp 2003-09-09 20:01:36.000000000 +0200 @@ -45,8 +45,7 @@ Kaboodle::KaboodleApp::KaboodleApp() Kaboodle::KaboodleApp::~KaboodleApp() { - // do not delete ui here, it might be the one closing us via closeEvent - // ui is deleted automatically anyway. +// delete ui; } #include "kaboodleapp.moc" diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kaboodle/kaboodleengine.desktop kdemultimedia-3.1.4.19-4/kaboodle/kaboodleengine.desktop --- kdemultimedia-3.1.4/kaboodle/kaboodleengine.desktop 2003-07-13 21:29:27.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kaboodle/kaboodleengine.desktop 2003-06-25 17:01:53.000000000 +0200 @@ -2,7 +2,6 @@ Encoding=UTF-8 Name=Embedded Media Player Engine Name[af]=Ingebedde Media Speler Masjien -Name[bg]=Вграден Media Player Name[bs]=Uključeni Media Player Name[ca]=Motor del reproductor multimèdia incrustat Name[cs]=Vestavěný přehrávač médií diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kaudiocreator/Makefile.am kdemultimedia-3.1.4.19-4/kaudiocreator/Makefile.am --- kdemultimedia-3.1.4/kaudiocreator/Makefile.am 2003-05-07 13:46:47.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kaudiocreator/Makefile.am 2003-02-12 21:09:43.000000000 +0100 @@ -21,7 +21,7 @@ KDE_ICON = AUTO SUBDIRS = icons -appsdir = $(kde_appsdir)/Multimedia +appsdir = $(kde_appsdir)/Applications/Multimedia apps_DATA = kaudiocreator.desktop data_DATA = kaudiocreatorui.rc diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kaudiocreator/cdconfigimp.cpp kdemultimedia-3.1.4.19-4/kaudiocreator/cdconfigimp.cpp --- kdemultimedia-3.1.4/kaudiocreator/cdconfigimp.cpp 2003-09-02 03:17:41.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kaudiocreator/cdconfigimp.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -75,7 +75,6 @@ extern "C" { /* This is in support for the Mega Hack, if cdparanoia ever is fixed, or we use another ripping library we can remove this. */ -#define _LINUX_BYTEORDER_SWAB_H #include #include diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kaudiocreator/kaudiocreator.desktop kdemultimedia-3.1.4.19-4/kaudiocreator/kaudiocreator.desktop --- kdemultimedia-3.1.4/kaudiocreator/kaudiocreator.desktop 2003-05-07 13:46:47.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kaudiocreator/kaudiocreator.desktop 2003-09-23 20:52:07.000000000 +0200 @@ -45,7 +45,7 @@ Comment[zh_TW]=製作聲音檔案的前 Comment[zu]=Isiqalo sesiphelo sokuzwakalayo kwefayela lokludala BinaryPattern=kaudiocreator; Protocols= -Name=KAudioCreator +Name=AudioCD Creator Name[ar]=منشئ صوت كيدي Name[bg]=КЗвученCreator Name[eo]=Sonorkreilo diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kdemultimedia.lsm kdemultimedia-3.1.4.19-4/kdemultimedia.lsm --- kdemultimedia-3.1.4/kdemultimedia.lsm 2003-09-03 02:11:14.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kdemultimedia.lsm 2003-06-25 17:01:53.000000000 +0200 @@ -1,7 +1,7 @@ Begin4 Title: kdemultimedia -Version: 3.1.4 -Entered-date: 2003-09-08 +Version: 3.1.2 +Entered-date: 2003-05-05 Description: Multimedia written for the K Desktop Environment (KDE) Keywords: KDE X11 desktop Qt Author: submit@bugs.kde.org (KDE Bugtracking System) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/au/kfile_au.cpp kdemultimedia-3.1.4.19-4/kfile-plugins/au/kfile_au.cpp --- kdemultimedia-3.1.4/kfile-plugins/au/kfile_au.cpp 2003-09-09 01:40:49.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/au/kfile_au.cpp 2003-02-03 16:33:02.000000000 +0100 @@ -41,7 +41,7 @@ typedef unsigned short uint16_t; typedef KGenericFactory AuFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" )) +K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" )); KAuPlugin::KAuPlugin(QObject *parent, const char *name, const QStringList &args) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/au/kfile_au.desktop kdemultimedia-3.1.4.19-4/kfile-plugins/au/kfile_au.desktop --- kdemultimedia-3.1.4/kfile-plugins/au/kfile_au.desktop 2003-07-13 21:29:28.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/au/kfile_au.desktop 2003-06-25 17:01:53.000000000 +0200 @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Service Name=AU Info Name[af]=Au Inligting -Name[bg]=AU Информация Name[ca]=Informació AU Name[cs]=AU info Name[da]=AU-info diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/avi/kfile_avi.cpp kdemultimedia-3.1.4.19-4/kfile-plugins/avi/kfile_avi.cpp --- kdemultimedia-3.1.4/kfile-plugins/avi/kfile_avi.cpp 2003-09-09 01:40:49.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/avi/kfile_avi.cpp 2003-02-03 16:33:02.000000000 +0100 @@ -43,7 +43,7 @@ typedef unsigned long long uint64_t; typedef KGenericFactory AviFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" )) +K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" )); KAviPlugin::KAviPlugin(QObject *parent, const char *name, const QStringList &args) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/avi/kfile_avi.desktop kdemultimedia-3.1.4.19-4/kfile-plugins/avi/kfile_avi.desktop --- kdemultimedia-3.1.4/kfile-plugins/avi/kfile_avi.desktop 2003-07-13 21:29:28.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/avi/kfile_avi.desktop 2003-06-25 17:01:53.000000000 +0200 @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Service Name=AVI Info Name[af]=Avi Inligting -Name[bg]=AVI Информация Name[ca]=Informació AVI Name[cs]=AVI info Name[da]=AVI-info diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/m3u/kfile_m3u.cpp kdemultimedia-3.1.4.19-4/kfile-plugins/m3u/kfile_m3u.cpp --- kdemultimedia-3.1.4/kfile-plugins/m3u/kfile_m3u.cpp 2003-09-09 01:40:49.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/m3u/kfile_m3u.cpp 2003-03-26 21:41:27.000000000 +0100 @@ -35,7 +35,7 @@ typedef KGenericFactory M3uFactory; -K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) ) +K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) ); KM3uPlugin::KM3uPlugin( QObject *parent, const char *name, const QStringList &preferredItems ) @@ -55,7 +55,7 @@ KM3uPlugin::KM3uPlugin( QObject *parent, bool KM3uPlugin::readInfo( KFileMetaInfo& info, uint ) { QFile f(info.path()); - if (!f.open(IO_ReadOnly)) return false; + f.open(IO_ReadOnly); QTextStream str(&f); str.setEncoding(QTextStream::Locale); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/mp3/kfile_mp3.cpp kdemultimedia-3.1.4.19-4/kfile-plugins/mp3/kfile_mp3.cpp --- kdemultimedia-3.1.4/kfile-plugins/mp3/kfile_mp3.cpp 2003-09-09 01:40:49.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/mp3/kfile_mp3.cpp 2003-03-26 21:41:27.000000000 +0100 @@ -42,7 +42,7 @@ extern "C" { typedef KGenericFactory Mp3Factory; -K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )) +K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )); KMp3Plugin::KMp3Plugin(QObject *parent, const char *name, const QStringList &args) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/ogg/kfile_ogg.cpp kdemultimedia-3.1.4.19-4/kfile-plugins/ogg/kfile_ogg.cpp --- kdemultimedia-3.1.4/kfile-plugins/ogg/kfile_ogg.cpp 2003-09-09 01:40:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/ogg/kfile_ogg.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -59,7 +59,7 @@ static const char* const knownTranslatio // I18N_NOOP("Isrc") // dunno what an Isrc number is, the link is broken }; -K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory("kfile_ogg")) +K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory("kfile_ogg")); KOggPlugin::KOggPlugin( QObject *parent, const char *name, const QStringList &args ) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kfile-plugins/wav/kfile_wav.cpp kdemultimedia-3.1.4.19-4/kfile-plugins/wav/kfile_wav.cpp --- kdemultimedia-3.1.4/kfile-plugins/wav/kfile_wav.cpp 2003-09-09 01:40:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kfile-plugins/wav/kfile_wav.cpp 2002-05-28 22:50:11.000000000 +0200 @@ -41,7 +41,7 @@ typedef unsigned int uint32_t; typedef KGenericFactory WavFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" )) +K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" )); KWavPlugin::KWavPlugin(QObject *parent, const char *name, const QStringList &args) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kioslave/audiocd/audiocd.cpp kdemultimedia-3.1.4.19-4/kioslave/audiocd/audiocd.cpp --- kdemultimedia-3.1.4/kioslave/audiocd/audiocd.cpp 2003-09-02 03:17:44.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kioslave/audiocd/audiocd.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -49,11 +49,11 @@ extern "C" by linux/cdrom.h. The only chance is to undef it again, so it gets included. (matz) */ #undef _I386_TYPES_H -#endif /* And uses GNU C extensions without providing fallbacks for non-GNUisms. Fortunately we (or other headers) don't need the swab routines. */ #define _LINUX_BYTEORDER_SWAB_H +#endif #include #endif #include diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kioslave/audiocd/kcmaudiocd/audiocd.desktop kdemultimedia-3.1.4.19-4/kioslave/audiocd/kcmaudiocd/audiocd.desktop --- kdemultimedia-3.1.4/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2003-07-13 21:29:28.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2003-11-25 17:30:30.000000000 +0100 @@ -3,13 +3,13 @@ Encoding=UTF-8 Exec=kcmshell audiocd Icon=cdaudio_unmount Type=Application +DocPath=kcontrol/kcmaudiocd/index.html X-KDE-ModuleType=Library X-KDE-Library=audiocd -Name=Audio CDs +Name=Music Encoding Name[af]=Audio Cds -Name[bg]=Аудио дискове Name[bs]=Audio CDi Name[ca]=CD d'àudio Name[cs]=Zvuková CD @@ -48,7 +48,7 @@ Name[xh]=CDs Zokuvakalayo Name[zh_CN]=音频 CD Name[zh_TW]=音樂 CD Name[zu]=Ama-CD Okuzwakalayo -Comment=Audiocd IO Slave Configuration +Comment=Set CD/music information sources and quality Comment[af]=Klank cd Io Slaaf Opstelling Comment[ar]=اعدادات Audiocd IO Slave Comment[az]=Name=Audiosd IO Kölələri Quraşdırması diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmid/Makefile.am kdemultimedia-3.1.4.19-4/kmid/Makefile.am --- kdemultimedia-3.1.4/kmid/Makefile.am 2003-05-07 13:46:48.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmid/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -32,11 +32,7 @@ servicetypedir = $(kde_servicetypesdir) SUBDIRS = maps examples pics applnk_DATA = kmid.desktop -applnkdir = $(kde_appsdir)/Multimedia/More - -install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/kmid.desktop +applnkdir = $(kde_appsdir)/Applications/Multimedia mime_DATA = x-karaoke.desktop mimedir = $(kde_mimedir)/audio diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmid/kmid.desktop kdemultimedia-3.1.4.19-4/kmid/kmid.desktop --- kdemultimedia-3.1.4/kmid/kmid.desktop 2003-05-07 13:46:48.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmid/kmid.desktop 2003-09-30 20:26:07.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 BinaryPattern=kmid; -Name=KMid +Name=MIDI Synthesizer Name[af]=Kmid Name[eo]=MIDI-ludilo Name[sv]=Kmid @@ -9,7 +9,7 @@ Name[th]=มิดี้ - K Name[zh_TW]=KMidi Name[zu]=KMidi MimeType=audio/x-karaoke;audio/x-midi;audio/midi -GenericName=Midi/Karaoke Player +GenericName=MIDI Synthesizer GenericName[af]=Midi/Kareokie Speler GenericName[ar]=مشغل Midi/Karaoke GenericName[bg]=Плеар на Midi/Karaoke diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmid/kmidframe.cpp kdemultimedia-3.1.4.19-4/kmid/kmidframe.cpp --- kdemultimedia-3.1.4/kmid/kmidframe.cpp 2003-07-13 21:29:29.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmid/kmidframe.cpp 2003-02-03 16:33:02.000000000 +0100 @@ -167,7 +167,9 @@ kmidFrame::kmidFrame(const char *name) SLOT(options_FontChange()), actionCollection(), "change_font"); - KStdAction::keyBindings( this, SLOT( slotConfigureKeys() ), actionCollection() ); + (void)new KAction(i18n("Configure &Keys..."), 0, this, + SLOT(options_KeyConfig()), actionCollection(), + "configure_keys"); (void)new KAction(i18n("MIDI &Setup..."), 0, this, SLOT(options_MidiSetup()), actionCollection(), "midi_setup"); @@ -609,11 +611,20 @@ void kmidFrame::options_ChannelViewOptio delete dlg; } -void kmidFrame::slotConfigureKeys() +void kmidFrame::options_KeyConfig() { - KKeyDialog::configure( actionCollection(), this ); -} + /* if ( KKeyDialog::configureKeys( kKeysAccel ) ) + { + kKeysAccel->changeMenuAccel(m_song,0,"Play/Pause"); + kKeysAccel->changeMenuAccel(m_song,2,"Stop"); + kKeysAccel->changeMenuAccel(m_song,4,"Previous Song"); + kKeysAccel->changeMenuAccel(m_song,5,"Next Song"); + kKeysAccel->changeMenuAccel(m_options,3,"See Text events"); + kKeysAccel->changeMenuAccel(m_options,4,"See Lyrics events"); + } + */ +} void kmidFrame::openURL( const QString url ) { diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmid/kmidframe.h kdemultimedia-3.1.4.19-4/kmid/kmidframe.h --- kdemultimedia-3.1.4/kmid/kmidframe.h 2003-07-13 21:29:29.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmid/kmidframe.h 2002-05-28 22:50:16.000000000 +0200 @@ -94,8 +94,7 @@ public slots: void options_ShowChannelView(); void options_ChannelViewOptions(); void options_FontChange(); - void slotConfigureKeys(); - + void options_KeyConfig(); void options_MidiSetup(); void spacePressed(); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmid/kmidui.rc kdemultimedia-3.1.4.19-4/kmid/kmidui.rc --- kdemultimedia-3.1.4/kmid/kmidui.rc 2003-07-13 21:29:29.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmid/kmidui.rc 2003-02-03 16:33:02.000000000 +0100 @@ -1,5 +1,5 @@ - + &File @@ -17,7 +17,7 @@ - + &Settings @@ -28,6 +28,8 @@ + + Main Toolbar diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/Makefile.am kdemultimedia-3.1.4.19-4/kmidi/Makefile.am --- kdemultimedia-3.1.4/kmidi/Makefile.am 2003-09-08 20:03:51.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmidi/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -15,7 +15,7 @@ AM_CPPFLAGS = -DDEFAULT_PATH=\"$(TIMID_D if GXXOPTIMIZE KDE_CXXFLAGS = -O3 -fomit-frame-pointer -ffast-math endif -AM_LDFLAGS = $(all_libraries) $(ARTSFLAGS) $(KDE_RPATH) +LDFLAGS = $(all_libraries) $(ARTSFLAGS) $(KDE_RPATH) #LDADD = $(LIB_KFILE) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRALIBS) -lsoundserver_idl -lartsflow LDADD = $(LIB_KFILE) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRALIBS) @@ -59,7 +59,7 @@ METASOURCES = AUTO SUBDIRS = config bitmaps prep-TIMIDITY TIMIDITY BITMAPS -appsdir = $(kde_appsdir)/Multimedia/More +appsdir = $(kde_appsdir)/Applications/Multimedia apps_DATA = kmidi.desktop KDE_ICON = kmidi @@ -75,8 +75,6 @@ EXTRA_DIST = $(apps_DATA) $(pics_DATA) # flex -t -B $(srcdir)/cfg.l >cfg.cpp install-data-local: - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/kmidi.desktop $(mkinstalldirs) $(DESTDIR)$(TIMID_DIR)/patch if [ ! -f $(DESTDIR)$(TIMID_DIR)/patch/sologrnd.pat ]; then $(INSTALL_DATA) $(srcdir)/config/patch/sologrnd.pat $(DESTDIR)$(TIMID_DIR)/patch ; fi if [ ! -f $(DESTDIR)$(TIMID_DIR)/patch/nylongt2.pat ]; then $(INSTALL_DATA) $(srcdir)/config/patch/nylongt2.pat $(DESTDIR)$(TIMID_DIR)/patch ; fi @@ -99,7 +97,7 @@ install-data-local: uninstall-local: - rm -f $(DESTDIR)$(kde_appsdir)/Multimedia/kmidi.desktop + rm -f $(DESTDIR)$(kde_appsdir)/Applications/Multimedia/kmidi.desktop rm -f $(DESTDIR)$(TIMID_DIR)/patch/acbass.pat rm -f $(DESTDIR)$(TIMID_DIR)/patch/cymride1.pat rm -f $(DESTDIR)$(TIMID_DIR)/patch/hihatcl.pat diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/TIMIDITY/Makefile.am kdemultimedia-3.1.4.19-4/kmidi/TIMIDITY/Makefile.am --- kdemultimedia-3.1.4/kmidi/TIMIDITY/Makefile.am 2003-09-08 20:03:53.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmidi/TIMIDITY/Makefile.am 2003-09-22 02:10:06.000000000 +0200 @@ -10,7 +10,7 @@ INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags` AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS) -AM_LDFLAGS = `$(ARTSCCONFIG) --libs` +LDFLAGS = `$(ARTSCCONFIG) --libs` LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm # Where to install the patches, config files, and MIDI files. @@ -18,13 +18,9 @@ LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) # or you'll need to invoke timidity with the -L option. TIMID_DIR = $(kde_datadir)/kmidi/config -appsdir = $(kde_appsdir)/Multimedia/More +appsdir = $(kde_appsdir)/Applications/Multimedia apps_DATA = timidity.desktop -install-data-local: uninstall.desktop - $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia - $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/timidity.desktop - bin_PROGRAMS = timidity timidity_SOURCES = timidity.c common.c readmidi.c playmidi.c resample.c mix.c instrum.c \ diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/TIMIDITY/timidity.desktop kdemultimedia-3.1.4.19-4/kmidi/TIMIDITY/timidity.desktop --- kdemultimedia-3.1.4/kmidi/TIMIDITY/timidity.desktop 2003-07-13 21:29:31.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmidi/TIMIDITY/timidity.desktop 2003-06-25 17:01:53.000000000 +0200 @@ -4,7 +4,6 @@ BinaryPattern=kmidi; MimeType=audio/x-midi;audio/x-karaoke; GenericName=MIDI Synthesizer GenericName[af]=Midi Sintetiseerder -GenericName[bg]=Синтезатор на Midi GenericName[bs]=MIDI sintisajzer GenericName[ca]=Sintetitzador MIDI GenericName[cs]=MIDI syntezátor diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/bwlednum.cpp kdemultimedia-3.1.4.19-4/kmidi/bwlednum.cpp --- kdemultimedia-3.1.4/kmidi/bwlednum.cpp 1999-03-02 00:37:23.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/kmidi/bwlednum.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -3,9 +3,12 @@ * * Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu * - * $Id: bwlednum.cpp,v 1.3 1999/03/01 23:37:23 kulow Exp $ + * $Id: bwlednum.cpp,v 1.5 2003/06/25 15:01:53 jefft Exp $ * * $Log: bwlednum.cpp,v $ + * Revision 1.5 2003/06/25 15:01:53 jefft + * Merge with KDE 3.1.2 release + * * Revision 1.3 1999/03/01 23:37:23 kulow * CVS_SILENT ported to Qt 2.0 * diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/bwlednum.h kdemultimedia-3.1.4.19-4/kmidi/bwlednum.h --- kdemultimedia-3.1.4/kmidi/bwlednum.h 1999-06-27 19:57:34.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmidi/bwlednum.h 2003-06-25 17:01:53.000000000 +0200 @@ -5,9 +5,12 @@ * Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu * * - * $Id: bwlednum.h,v 1.4 1999/06/27 17:57:34 kulow Exp $ + * $Id: bwlednum.h,v 1.5 2003/06/25 15:01:53 jefft Exp $ * * $Log: bwlednum.h,v $ + * Revision 1.5 2003/06/25 15:01:53 jefft + * Merge with KDE 3.1.2 release + * * Revision 1.4 1999/06/27 17:57:34 kulow * fixes for --enable-final and other problems :) * diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/kmidi.cpp kdemultimedia-3.1.4.19-4/kmidi/kmidi.cpp --- kdemultimedia-3.1.4/kmidi/kmidi.cpp 2003-07-13 21:29:31.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmidi/kmidi.cpp 2003-10-24 13:56:00.000000000 +0200 @@ -1212,7 +1212,7 @@ void KMidi::redoplaybox() if(filenamestr.right(4) == QString(".mid") ||filenamestr.right(4) == QString(".MID")) filenamestr = filenamestr.left(filenamestr.length()-4); } - if (errindex == 0) filenamestr.insert(0, '#'); + if (errindex == 0) filenamestr.prepend('#'); playbox->insertItem(filenamestr); } } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmidi/kmidi.desktop kdemultimedia-3.1.4.19-4/kmidi/kmidi.desktop --- kdemultimedia-3.1.4/kmidi/kmidi.desktop 2003-07-13 21:29:31.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmidi/kmidi.desktop 2004-02-05 22:01:04.000000000 +0100 @@ -4,7 +4,6 @@ BinaryPattern=kmidi; MimeType=audio/x-midi;audio/x-karaoke; GenericName=MIDI Player GenericName[af]=Midi Speler -GenericName[bg]=MIDI плейър GenericName[bs]=MIDI player GenericName[ca]=Reproductor MIDI GenericName[cs]=MIDI přehrávač @@ -40,7 +39,7 @@ GenericName[xh]=Umdlali we MIDIWe CD GenericName[zh_CN]=MIDI 播放器 GenericName[zh_TW]=MIDI 播放器 GenericName[zu]=Umdlali we-MIDI -Name=KMidi +Name=MIDI Player Name[af]=Kmidi Name[eo]=MIDI-ludilo Name[fr]=KMIDI @@ -48,7 +47,7 @@ Name[pt_BR]=MIDI Name[sv]=Kmidi Name[th]=มิดี้ - K DocPath=kmidi/index.html -Exec=kmidi %m %i %f +Exec=kmidi %m %i --caption '%c' --nofork %f Icon=kmidi TerminalOptions= Path= diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/Makefile.am kdemultimedia-3.1.4.19-4/kmix/Makefile.am --- kdemultimedia-3.1.4/kmix/Makefile.am 2003-05-07 13:46:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/Makefile.am 2003-06-25 17:01:53.000000000 +0200 @@ -43,7 +43,7 @@ $(srcdir)/version.h: VERSION EXTRA_DIST = kmix.desktop VERSION -appsdir = $(kde_appsdir)/Multimedia +appsdir = $(kde_appsdir)/Applications/Multimedia apps_DATA = kmix.desktop rcdir = $(kde_datadir)/kmix diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/control/kmixcfg.desktop kdemultimedia-3.1.4.19-4/kmix/control/kmixcfg.desktop --- kdemultimedia-3.1.4/kmix/control/kmixcfg.desktop 2003-07-13 21:29:34.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/control/kmixcfg.desktop 2003-02-03 16:33:02.000000000 +0100 @@ -27,7 +27,7 @@ Name[fr]=Console de mixage Name[gl]=Mesturador Name[he]=מערבל Name[hu]=Hangkeverőpult -Name[is]=Hljóðblöndun +Name[is]=Hljóðblöndun Name[ja]=ミキサー Name[ko]=믹서 Name[lt]=Mikšeris @@ -35,7 +35,6 @@ Name[lv]=Mikseris Name[mk]=Миксета Name[nb]=Mikser Name[nn]=Miksar -Name[nso]=Sehlakanyi Name[pl]=Mikser Name[pt]=Mesa de Mistura Name[ru]=Микшер @@ -47,7 +46,6 @@ Name[th]=มิกเซอร์เส Name[tr]=Karıştırıcı Name[uk]=Мікшер Name[ven]=Tshitangisi -Name[vi]=Bộ trộn Name[wa]=Maxheu d' sons Name[xh]=Umxubi Name[zh_CN]=混音器 @@ -77,18 +75,18 @@ Comment[he]=שינוי הגדרות עו Comment[hr]=Kontroler miksera zvučne kartice Comment[hu]=a hangkeverő beállításai Comment[id]=Kontrol mixer kartu suara -Comment[is]=Stillingar tólsins sem stjórnar styrkleika hljóðrása +Comment[is]=Stillingar tólsins sem stjórnar styrkleika hljóðrása Comment[it]=Controllo del mixer della scheda sonora Comment[ja]=サウンドカードミキサー管理 Comment[ko]=소리 카드 믹서를 조절합니다 (소리 조절) Comment[lt]=Garso plokštės mikšerio valdiklis -Comment[mk]=Контрола на миксерот на звучната картичка +Comment[mk]=Контрола на звукот Comment[mt]=Kontroll tal-Mixer tas-Soundcard Comment[nb]=Kontrollredskap for lydkortmikseren Comment[nl]=Geluidskaartmixer instellen Comment[nn]=Styring av lydkortmiksaren Comment[pl]=Sterowanie mikserem karty dźwiękowej -Comment[pt]=Controlo da mesa de mistura da placa de som +Comment[pt]=Controlo da mistura da placa de som Comment[pt_BR]=Controle da placa de som Comment[ro]=Controlează mixerul plăcii de sunet Comment[ru]=Утилита управления микшером звуковой карты @@ -100,7 +98,6 @@ Comment[ta]=´Ä¢«ð¨¼ ¸Ä츢ì Comment[tr]=Ses kartı/karıştırma denetimi Comment[uk]=Керування мікшером звукової карти Comment[ven]=Tshilanguli tshau tanganyisa garata ya mubvumo -Comment[vi]=Điều khiển bộ trộn Soundcard Comment[wa]=Contrôle do maxheu d' sons del cåte son Comment[xh]=Ulawulo lomxubi wekhadi lesandi Comment[zh_CN]=声卡混音器控制 @@ -123,20 +120,18 @@ Keywords[fr]=son,console de mixage,volum Keywords[he]=כניסה למערכת,איתחול,KMix,צליל,מערבל,עוצמה,שמע Keywords[hr]=Sound,Mixer,Volume,Audio,KMix,Mix,Zvuk,Mikser,Jačina,prijava Keywords[hu]=hang,keverőpult,hangerő,audió,KMix,Mix,bejelentkezés,indulás -Keywords[is]=Hljóð,Mixer,Styrkleiki,Hávaði,KMix,innstimplun +Keywords[is]=Hljóð,Mixer,Styrkleiki,Hávaði,KMix,innstimplun Keywords[it]=Suono,Mixer,Volume,Audio,KMix,Mix,accesso,avvio Keywords[ja]=サウンド,ミキサー,音量,オーディオ,KMix,Mix,ログイン,スタートアップ Keywords[ko]=Sound,Mixer,Volume,Audio,KMix,Mix,login,startup,사운드,소리,소리 크기,오디오,믹서,소리 조절,크기 조절,로긴,시작 Keywords[lt]=Garsas,Mikšeris,Garsumas,Audio,KMix,Mix,registracija,pradžia Keywords[lv]=Skaņa,Mikseris,Līmenis,Audio,KMix,Mix,pieteikšanās,startēšana -Keywords[mk]=звук,миксета,гласност,аудио,KMix,Mix,вчитување,почеток Keywords[mt]=Sound,Mixer,Volume,Audio,KMix,Mix,login,startup,mikser,volum,awdio,ħoss Keywords[nb]=Lyd,Mikser,Volum,KMix,Miks Keywords[nl]=sound,geluid,mixer,volume,audio,kmix,mix,inloggen,login,opstarten Keywords[nn]=lyd,miksar,volum,lydstyrke,KMix,audio,oppstart,Mix,innlogging -Keywords[nso]=Modumo,Sehlakanyi,Volume,Kwagalo,KMotswako,Motswako,tseno ,thomiso Keywords[pl]=Dzwiek,Mikser,Głośność,Audio,KMix,Mix,login,uruchamianie -Keywords[pt]=som,mistura,volume,áudio,kmix,ligação,arranque +Keywords[pt]=som,mistura,volume,audio,kmix,ligação,arranque Keywords[pt_BR]=Som,Mixer,Volume,Áudio,KMix,Mix,login,início,inicialização Keywords[ro]=sunet,mixer,volum,audio,kmix,mix,logare,pornire Keywords[sk]=Zvuk,Mixer,Hlasitosť,Audio,KMix,Mix,prihlásenie,štart @@ -146,7 +141,6 @@ Keywords[th]=เสียง,ระบ Keywords[tr]=Ses,Karıştırıcı,Ses Ayarı,Ses,KMix,Karıştır,oturum açma,Başlangıç Keywords[uk]=звук,мікшер,гучність,Audio,аудіо,KMix,Sound,змішувати,реєстрація,запуск Keywords[ven]=Mubvumo,Tshautanganisa,Volomu,Zwaupfiwa,Tanganisa ha K,tanganisa,U loga,U thoma -Keywords[vi]=Sound,Mixer,Volume,Audio,KMix,Mix,login,startup, âm thanh, bộ trộn, âm lượng Keywords[wa]=Son,Maxheu,Mixer,Volume,Audio,KMix,Mix,login,enondaedje Keywords[xh]=Isandi,Umxubi,Umqulu,Evakalayo,KMix,Xuba,igama elithile,qala Keywords[zh_CN]=Sound,Mixer,Volume,Audio,KMix,Mix,login,startup,声音,混音器,音量,音频,登录,启动 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmix.cpp kdemultimedia-3.1.4.19-4/kmix/kmix.cpp --- kdemultimedia-3.1.4/kmix/kmix.cpp 2003-05-07 13:46:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmix.cpp 2003-10-16 17:55:31.000000000 +0200 @@ -30,8 +30,10 @@ #include #include #include +#include // include files for KDE +#include #include #include #include @@ -52,6 +54,10 @@ #include "kmixprefdlg.h" #include "kmixdockwidget.h" +#include + +using std::cerr; +using std::endl; KMixApp::KMixApp() : KUniqueApplication(), m_kmix( 0 ) @@ -70,7 +76,10 @@ KMixApp::newInstance() { if ( m_kmix ) { - m_kmix->show(); + if (KCmdLineArgs::parsedArgs()->isSet("show")) + m_kmix->show(); + else + cerr << "KMix is already running!" << endl; } else { @@ -97,7 +106,7 @@ void KMixApp::quitExtended() { KMixWindow::KMixWindow() : KMainWindow(0, 0, 0 ), m_maxId( 0 ), m_dockWidget( 0L ) { - m_visibilityUpdateAllowed = true; + m_visibilityUpdateAllowed = true; m_mixerWidgets.setAutoDelete(true); initMixer(); initActions(); @@ -137,14 +146,14 @@ KMixWindow::KMixWindow() updateDocking(); - if ( m_startVisible ) - { - show(); - } - else - { - hide(); - } + if (KCmdLineArgs::parsedArgs()->isSet("show")) + { + show(); + } + else + { + hide(); + } connect( kapp, SIGNAL( aboutToQuit()), SLOT( saveConfig())); } @@ -362,15 +371,18 @@ KMixWindow::updateDockIcon() void KMixWindow::saveConfig() { - //printf("saveConfig(): Visible=%i , %i\n", isVisible() , m_isVisible); // !!! + //printf("saveConfig(): Visible=%i , %i\n", isVisible() , m_isVisible); // !!! KConfig *config = kapp->config(); + + config->setGroup("General"); + config->writeEntry("AutoLaunch", m_autoLaunch); + config->setGroup(0); config->writeEntry( "Size", size() ); config->writeEntry( "Position", pos() ); // Cannot use isVisible() here, as in the "aboutToQuit()" case this widget is already hidden. // (Please note that the problem was only there when quitting via Systray - esken). - config->writeEntry( "Visible", m_isVisible ); config->writeEntry( "Menubar", m_showMenubar ); config->writeEntry( "AllowDocking", m_showDockWidget ); config->writeEntry( "TrayVolumeControl", m_volumeWidget ); @@ -402,15 +414,17 @@ void KMixWindow::loadConfig() { KConfig *config = kapp->config(); - config->setGroup(0); + config->setGroup("General"); + m_autoLaunch = config->readBoolEntry("AutoLaunch", true); + + config->setGroup(0); m_showDockWidget = config->readBoolEntry("AllowDocking", true); m_volumeWidget = config->readBoolEntry("TrayVolumeControl", true); //hide on close has to stay true for usability. KMixPrefDlg option commented out. nolden m_hideOnClose = config->readBoolEntry("HideOnClose", true); m_showTicks = config->readBoolEntry("Tickmarks", false); m_showLabels = config->readBoolEntry("Labels", false); - m_startVisible = config->readBoolEntry("Visible", true); // show/hide menu bar m_showMenubar = config->readBoolEntry("Menubar", true); @@ -582,14 +596,15 @@ void KMixWindow::showSettings() { if (!m_prefDlg->isVisible()) - { - m_prefDlg->m_dockingChk->setChecked( m_showDockWidget ); - m_prefDlg->m_volumeChk->setChecked(m_volumeWidget); - m_prefDlg->m_showTicks->setChecked( m_showTicks ); - m_prefDlg->m_showLabels->setChecked( m_showLabels ); + { + m_prefDlg->m_autoLaunchChk->setChecked( m_autoLaunch ); + m_prefDlg->m_dockingChk->setChecked( m_showDockWidget ); + m_prefDlg->m_volumeChk->setChecked(m_volumeWidget); + m_prefDlg->m_showTicks->setChecked( m_showTicks ); + m_prefDlg->m_showLabels->setChecked( m_showLabels ); - m_prefDlg->show(); - } + m_prefDlg->show(); + } } @@ -699,18 +714,18 @@ KMixWindow::newMixer() */ bool KMixWindow::isCategoryUsed(Mixer* mixer, MixDevice::DeviceCategory categoryMask) { - bool categoryUsed = false; - MixSet mixSet = mixer->getMixSet(); - MixDevice *mixDevice = mixSet.first(); - for ( ; mixDevice != 0; mixDevice = mixSet.next()) { - if ( mixDevice->category() & categoryMask ) { - // found one device wiht a matching category, that is enough. - categoryUsed = true; - break; - } - } - - return categoryUsed; + bool categoryUsed = false; + MixSet mixSet = mixer->getMixSet(); + MixDevice *mixDevice = mixSet.first(); + for ( ; mixDevice != 0; mixDevice = mixSet.next()) { + if ( mixDevice->category() & categoryMask ) { + // found one device wiht a matching category, that is enough. + categoryUsed = true; + break; + } + } + + return categoryUsed; } @@ -741,6 +756,7 @@ KMixWindow::saveVolumes() void KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) { + m_autoLaunch = prefDlg->m_autoLaunchChk->isChecked(); m_showDockWidget = prefDlg->m_dockingChk->isChecked(); m_volumeWidget = prefDlg->m_volumeChk->isChecked(); m_showTicks = prefDlg->m_showTicks->isChecked(); @@ -796,16 +812,10 @@ KMixWindow::toggleVisibility() void KMixWindow::showEvent( QShowEvent * ) { - if ( m_visibilityUpdateAllowed ) { - m_isVisible = true; - } timer->start(500); } void KMixWindow::hideEvent( QHideEvent * ) { - if ( m_visibilityUpdateAllowed ) { - m_isVisible = false; - } timer->stop(); } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmix.desktop kdemultimedia-3.1.4.19-4/kmix/kmix.desktop --- kdemultimedia-3.1.4/kmix/kmix.desktop 2003-07-13 21:29:34.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmix.desktop 2003-10-09 23:18:31.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Exec=kmix -caption "%c" %i %m +Exec=kmix --show -caption "%c" %i %m DocPath=kmix/index.html TerminalOptions= Path= @@ -27,18 +27,15 @@ GenericName[fr]=Console de mixage GenericName[he]=מערבל צליל GenericName[hr]=Mikser zvuka GenericName[hu]=hangkeverő -GenericName[is]=Hljóðblöndun GenericName[it]=Mixer audio GenericName[ja]=サウンドミキサー GenericName[lt]=Garsų maišiklis GenericName[lv]=Skaņas Mikšeris -GenericName[mk]=Миксер на звукот GenericName[nb]=Lydmikser GenericName[nl]=geluidsmixer GenericName[nn]=Lydmiksar -GenericName[nso]=Sehlakanyi sa Modumo -GenericName[pl]=Ustawienia głośności -GenericName[pt]=Mesa de Mistura de Áudio +GenericName[pl]=Mikser dźwięku +GenericName[pt]=Mesa de Mistura Áudio GenericName[pt_BR]=Mixagem de som GenericName[ro]=Mixer de sunet GenericName[ru]=Звуковой микшер @@ -50,17 +47,15 @@ GenericName[th]=ปรับแต่ง GenericName[tr]=Ses Karıştırıcı GenericName[uk]=Аудіомікшер GenericName[ven]=Tshitanganisi tsha mubvumo -GenericName[vi]=Bộ trộn âm thanh GenericName[xh]=Umxubi WokuvakalayoU GenericName[zh_CN]=混音器 GenericName[zh_TW]=音效混音器 GenericName[zu]=Umxubi Womsindo -Name=KMix +Name=Sound Mixer Name[af]=Kmix Name[ca]=Kmix Name[eo]=Miksilo Name[lv]=KMiks -Name[nso]=KMotswako Name[sv]=Kmix Name[ven]=U tanganisa ha K X-KDE-StartupNotify=true diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmix.h kdemultimedia-3.1.4.19-4/kmix/kmix.h --- kdemultimedia-3.1.4/kmix/kmix.h 2003-05-07 13:46:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmix.h 2003-10-16 17:55:31.000000000 +0200 @@ -112,6 +112,7 @@ class KMixWindow : public KMainWindow QPopupMenu *m_viewMenu; QPopupMenu *m_helpMenu; + bool m_autoLaunch; bool m_showDockWidget; bool m_volumeWidget; bool m_hideOnClose; @@ -119,7 +120,6 @@ class KMixWindow : public KMainWindow bool m_showLabels; bool m_startVisible; bool m_showMenubar; - bool m_isVisible; bool m_visibilityUpdateAllowed; int m_maxId; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmixapplet.desktop kdemultimedia-3.1.4.19-4/kmix/kmixapplet.desktop --- kdemultimedia-3.1.4/kmix/kmixapplet.desktop 2003-07-13 21:29:34.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmixapplet.desktop 2003-10-02 17:09:05.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Name=KMix Applet +Name=Sound Mixer Name[af]=Kmix Miniprogram Name[ar]=بريمج التحكم بالصوت Name[az]=KMix Programcığı @@ -20,7 +20,7 @@ Name[gl]=Applet KMix Name[he]=יישומון בקרת עוצמה Name[hu]=KMix kisalkalmazás Name[id]=Applet KMix -Name[is]=KMix íforrit +Name[is]=KMix íforrit Name[it]=Applet KMix Name[ja]=KMix アプレット Name[ko]=KDE용 소리 조절 애플릿 @@ -30,8 +30,7 @@ Name[mk]=KMix аплет Name[mt]=Applet KMix Name[nb]=KMix-applet Name[nn]=KMix-applet -Name[nso]=Applet ya KMotswako -Name[pl]=Aplet KMix +Name[pl]=Programik KMix Name[pt]=Mesa de Mistura Name[pt_BR]=Mini-aplicativo do KMix Name[ro]=Miniaplicaţie KMix @@ -69,12 +68,10 @@ Comment[it]=Applet mixer Comment[ja]=サウンドミキサーアプレット Comment[lt]=Garsų maišiklio įskiepis Comment[lv]=Skaņas Mikšera Aplets -Comment[mk]=Аплет за звучниот миксер Comment[nb]=Lydmikser-applet Comment[nl]=Geluidsmixerapplet Comment[nn]=Lydmiksarapplet -Comment[nso]=Applet ya Motswako wa Modumo -Comment[pl]=Aplet ustawień głośności +Comment[pl]=Programik do miksera dżwięku Comment[pt]='Applet' da Mesa de Mistura Comment[pt_BR]=Um simples mini-aplicativo de Mixagem de Som Comment[ro]=Miniaplicaţie mixer de sunet @@ -87,7 +84,6 @@ Comment[th]=แอพเพล็ตผ Comment[tr]=Ses Karıştırıcı Programcığı Comment[uk]=Аплет аудіомікшера Comment[ven]=Tshitanganisi tsha mubvumo tsha Applet -Comment[vi]=Applet bộ trộn âm thanh Comment[zh_CN]=混音器小程序 Comment[zh_TW]=音效混音器小程式 Comment[zu]=Umxubi Womsindo We applet diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmixctrl_restore.desktop kdemultimedia-3.1.4.19-4/kmix/kmixctrl_restore.desktop --- kdemultimedia-3.1.4/kmix/kmixctrl_restore.desktop 2003-07-13 21:29:34.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmixctrl_restore.desktop 2003-02-03 16:33:02.000000000 +0100 @@ -23,20 +23,19 @@ Name[he]=שיחזור הגדרות המ Name[hr]=Vrati postavke miksera Name[hu]=A hangkeverő beállításainak visszatöltése Name[id]=Kembalikan seting Mixer -Name[is]=Sækja aftur stillingar hljóðrása +Name[is]=Sækja aftur stillingar hljóðrása Name[it]=Ripristina le impostazioni del mixer Name[ja]=ミキサー設定の修復 Name[ko]=소리 설정을 되돌려 놓음 Name[lt]=Gražinti mikšerio parametrus Name[lv]=Atjauno Miksera Uzstādījumus -Name[mk]=Врати ги поставките на миксерот +Name[mk]=Врати ги поставките Name[mt]=Reġġa' lura setings tal-Mixer Name[nb]=Gjennopprett mikserinnstillinger Name[nl]=Mixer-instellingen herstellen Name[nn]=Gjenopprett miksarinnstillingar -Name[nso]=Bolokaleswa Dipeakanyo tsa Sehlakanyi Name[pl]=Odtwarzanie ustawień miksera -Name[pt]=Repor a Configuração do Volume +Name[pt]=Restaurar as Definições de Volume Name[pt_BR]=Restaurar preferências do mixer Name[ro]=Reface setările mixerului Name[ru]=Восстанавливает настройки микшера @@ -49,7 +48,6 @@ Name[th]=เรียกคืนค่ Name[tr]=Karıştırıcı Ayarlarını Yeniden Yükle Name[uk]=Відновити параметри мікшера Name[ven]=Vhuedzedzani vhuvha ha tshitanganisi -Name[vi]=Khôi phục các thiết lập của bộ trộn Name[xh]=Gcina kwakhona izicwangciso zoMxubi Name[zh_CN]=恢复混音器设置 Name[zh_TW]=回復混音器設定 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmixprefdlg.cpp kdemultimedia-3.1.4.19-4/kmix/kmixprefdlg.cpp --- kdemultimedia-3.1.4/kmix/kmixprefdlg.cpp 2003-05-07 13:46:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmixprefdlg.cpp 2003-09-08 22:21:00.000000000 +0200 @@ -31,7 +31,7 @@ KMixPrefDlg::KMixPrefDlg( QWidget *parent ) - : KDialogBase( Plain, i18n( "KMix Preferences" ), + : KDialogBase( Plain, i18n( "Sound Mixer Preferences" ), Ok|Cancel|Apply, Ok, parent ) { // general buttons @@ -40,6 +40,12 @@ KMixPrefDlg::KMixPrefDlg( QWidget *paren QBoxLayout *layout = new QVBoxLayout( m_generalTab ); layout->setSpacing( KDialog::spacingHint() ); + m_autoLaunchChk = new QCheckBox(i18n("&Launch automatically on login"), + m_generalTab); + layout->addWidget(m_autoLaunchChk); + QWhatsThis::add(m_autoLaunchChk, i18n("Launch KMix automatically " + "when the current user logs in")); + m_dockingChk = new QCheckBox( i18n("&Dock into panel"), m_generalTab ); layout->addWidget( m_dockingChk ); QWhatsThis::add(m_dockingChk, i18n("Docks the mixer into the KDE panel")); @@ -53,7 +59,7 @@ KMixPrefDlg::KMixPrefDlg( QWidget *paren QWhatsThis::add(m_showTicks, i18n("Enable/disable tickmark scales on the sliders")); - m_showLabels = new QCheckBox( i18n("Show &labels"), m_generalTab ); + m_showLabels = new QCheckBox( i18n("&Show labels"), m_generalTab ); layout->addWidget( m_showLabels ); QWhatsThis::add(m_showLabels, i18n("Enables/disables description labels above the sliders")); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/kmixprefdlg.h kdemultimedia-3.1.4.19-4/kmix/kmixprefdlg.h --- kdemultimedia-3.1.4/kmix/kmixprefdlg.h 2003-05-07 13:46:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/kmixprefdlg.h 2003-09-08 22:21:00.000000000 +0200 @@ -48,6 +48,7 @@ class KMixPrefDlg : public KDialogBase KMixApp *m_mixApp; KMixPrefWidget *m_mixPrefTab; + QCheckBox *m_autoLaunchChk; QCheckBox *m_dockingChk; QCheckBox *m_volumeChk; QCheckBox *m_hideOnCloseChk; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kmix/main.cpp kdemultimedia-3.1.4.19-4/kmix/main.cpp --- kdemultimedia-3.1.4/kmix/main.cpp 2003-05-07 13:46:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kmix/main.cpp 2003-10-09 23:18:31.000000000 +0200 @@ -29,17 +29,16 @@ #include "version.h" static const char *description = -I18N_NOOP("KMix - KDE's full featured mini mixer"); +I18N_NOOP("Sound mixer - KDE's full featured mini mixer"); static KCmdLineOptions options[] = { - { 0, 0, 0 } - // INSERT YOUR COMMANDLINE OPTIONS HERE + { "show", "Show the main window if already running", 0 } }; int main(int argc, char *argv[]) { - KAboutData aboutData( "kmix", I18N_NOOP("KMix"), + KAboutData aboutData( "kmix", I18N_NOOP("Sound Mixer"), APP_VERSION, description, KAboutData::License_GPL, I18N_NOOP("(c) 1996-2000 Christian Esken\n(c) 2000-2003 Christian Esken, Stefan Schimanski")); @@ -62,5 +61,10 @@ int main(int argc, char *argv[]) return 0; KMixApp app; + + // We don't want session management interfering + // with launch on startup option + app.disableSessionManagement(); + return app.exec(); } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/krec/Makefile.am kdemultimedia-3.1.4.19-4/krec/Makefile.am --- kdemultimedia-3.1.4/krec/Makefile.am 2003-05-07 13:46:51.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/krec/Makefile.am 2003-02-12 21:09:43.000000000 +0100 @@ -25,7 +25,7 @@ krec_LDADD = krec.la rcdir = $(kde_datadir)/krec rc_DATA = krecui.rc -desktopdir = $(kde_appsdir)/Multimedia +desktopdir = $(kde_appsdir)/Applications/Multimedia desktop_DATA = krec.desktop messages: rc.cpp Binary files kdemultimedia-3.1.4/krec/cr16-app-krec.png and kdemultimedia-3.1.4.19-4/krec/cr16-app-krec.png differ Binary files kdemultimedia-3.1.4/krec/cr22-app-krec.png and kdemultimedia-3.1.4.19-4/krec/cr22-app-krec.png differ Binary files kdemultimedia-3.1.4/krec/cr32-app-krec.png and kdemultimedia-3.1.4.19-4/krec/cr32-app-krec.png differ Binary files kdemultimedia-3.1.4/krec/cr48-app-krec.png and kdemultimedia-3.1.4.19-4/krec/cr48-app-krec.png differ diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/krec/krec.desktop kdemultimedia-3.1.4.19-4/krec/krec.desktop --- kdemultimedia-3.1.4/krec/krec.desktop 2003-07-13 21:29:36.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/krec/krec.desktop 2003-09-30 20:26:07.000000000 +0200 @@ -8,9 +8,8 @@ Path= DocPath=krec/index.html Terminal=0 BinaryPattern=krec; -GenericName=Recording Tool +GenericName=Sound Recorder GenericName[af]=Opneem Program -GenericName[bg]=Инструмент за запис GenericName[bs]=Alat za snimanje GenericName[ca]=Eina per gravar GenericName[cs]=Nástroj pro nahrávání @@ -47,8 +46,7 @@ GenericName[xh]=Isixhobo Sokubhala phant GenericName[zh_CN]=录音工具 GenericName[zh_TW]=錄製工具 GenericName[zu]=Ithuluzi Lokuqopha -Name=KRec -Name[bg]=KЗапис +Name=Sound Recorder Name[nso]=KRekhota Name[sv]=Krec X-KDE-StartupNotify=true diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/krec/recordfile.h kdemultimedia-3.1.4.19-4/krec/recordfile.h --- kdemultimedia-3.1.4/krec/recordfile.h 2003-09-09 16:04:41.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/krec/recordfile.h 2003-10-29 16:50:57.000000000 +0100 @@ -34,9 +34,12 @@ class KAction; *@author Arnold Krille */ -class RecordFile : public QObject, public KListViewItem +class RecordFile : public QObject, KListViewItem { Q_OBJECT + + friend class KRecord; // So it can downcast + public: /// Constructs a new File as Child. RecordFile( KListViewItem *parent, QString filename, QObject *qobject=0 ); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/krec/session.h kdemultimedia-3.1.4.19-4/krec/session.h --- kdemultimedia-3.1.4/krec/session.h 2003-09-09 16:04:41.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/krec/session.h 2003-10-29 16:50:57.000000000 +0100 @@ -32,9 +32,12 @@ class RecordFile; *@author Arnold Krille */ -class Session : public QObject, public KListViewItem +class Session : public QObject, KListViewItem { Q_OBJECT + + friend class KRecord; // So it can downcast + public: /// Constructor Session( QString nprefix, KListView *parent=0, QObject *parObj=0 ); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/CDDialog.cpp kdemultimedia-3.1.4.19-4/kscd/CDDialog.cpp --- kdemultimedia-3.1.4/kscd/CDDialog.cpp 2003-05-07 13:46:51.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/CDDialog.cpp 2003-11-11 14:18:28.000000000 +0100 @@ -550,6 +550,13 @@ CDDialog::save() savecat = category.copy(); } + QString cat; + cat.sprintf("%s", cddbbasedir.utf8().data()); + QDir dir; + dir.setPath(cat); + if (!dir.exists(savecat.utf8().data())) + dir.mkdir(savecat.utf8().data()); + QString mag; mag.sprintf("%s/%s/%08lx",cddbbasedir.utf8().data(),savecat.utf8().data(),cdinfo.magicID); @@ -589,7 +596,6 @@ CDDialog::save_cddb_entry(QString& path, QFile file(path); - if( !file.open( IO_WriteOnly )) { QString str = i18n("Unable to write to file:\n%1\nPlease check " diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/Makefile.am kdemultimedia-3.1.4.19-4/kscd/Makefile.am --- kdemultimedia-3.1.4/kscd/Makefile.am 2003-09-08 20:04:02.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/Makefile.am 2003-02-12 21:09:43.000000000 +0100 @@ -2,10 +2,10 @@ mimedir = $(kde_mimedir)/text/ picsdir = $(kde_datadir)/kscd/pics/ -appsdir = $(kde_appsdir)/Multimedia +appsdir = $(kde_appsdir)/Applications/Multimedia CDDBDIR = $(kde_datadir)/kscd/cddb/ -AM_LDFLAGS = $(LIB_KIO) $(all_libraries) $(KDE_RPATH) +LDFLAGS = $(LIB_KIO) $(all_libraries) $(KDE_RPATH) kscd_LDADD = libwm/libworkman.la $(LIBCDROM) $(LIBCDAUDIO) $(LIBFPE) $(LIB_KIO) $(LIB_KDEUI) INCLUDES= $(all_includes) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/bwlednum/bwlednum.cpp kdemultimedia-3.1.4.19-4/kscd/bwlednum/bwlednum.cpp --- kdemultimedia-3.1.4/kscd/bwlednum/bwlednum.cpp 1999-03-02 00:37:59.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/kscd/bwlednum/bwlednum.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -3,9 +3,12 @@ * * Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu * - * $Id: bwlednum.cpp,v 1.2 1999/03/01 23:37:59 kulow Exp $ + * $Id: bwlednum.cpp,v 1.5 2003/06/25 15:01:53 jefft Exp $ * * $Log: bwlednum.cpp,v $ + * Revision 1.5 2003/06/25 15:01:53 jefft + * Merge with KDE 3.1.2 release + * * Revision 1.2 1999/03/01 23:37:59 kulow * CVS_SILENT ported to Qt 2.0 * diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/bwlednum/bwlednum.h kdemultimedia-3.1.4.19-4/kscd/bwlednum/bwlednum.h --- kdemultimedia-3.1.4/kscd/bwlednum/bwlednum.h 1999-03-02 00:38:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/kscd/bwlednum/bwlednum.h 2003-06-25 17:01:53.000000000 +0200 @@ -5,9 +5,12 @@ * Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu * * - * $Id: bwlednum.h,v 1.2 1999/03/01 23:38:00 kulow Exp $ + * $Id: bwlednum.h,v 1.5 2003/06/25 15:01:53 jefft Exp $ * * $Log: bwlednum.h,v $ + * Revision 1.5 2003/06/25 15:01:53 jefft + * Merge with KDE 3.1.2 release + * * Revision 1.2 1999/03/01 23:38:00 kulow * CVS_SILENT ported to Qt 2.0 * diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/bwlednum/example.cpp kdemultimedia-3.1.4.19-4/kscd/bwlednum/example.cpp --- kdemultimedia-3.1.4/kscd/bwlednum/example.cpp 1999-03-02 00:38:02.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/kscd/bwlednum/example.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -5,9 +5,12 @@ // Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu // // -// $Id: example.cpp,v 1.3 1999/03/01 23:38:02 kulow Exp $ +// $Id: example.cpp,v 1.5 2003/06/25 15:01:53 jefft Exp $ // // $Log: example.cpp,v $ +// Revision 1.5 2003/06/25 15:01:53 jefft +// Merge with KDE 3.1.2 release +// // Revision 1.3 1999/03/01 23:38:02 kulow // CVS_SILENT ported to Qt 2.0 // diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/bwlednum.cpp kdemultimedia-3.1.4.19-4/kscd/bwlednum.cpp --- kdemultimedia-3.1.4/kscd/bwlednum.cpp 1999-06-27 19:57:37.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/bwlednum.cpp 2003-06-25 17:01:53.000000000 +0200 @@ -3,9 +3,12 @@ * * Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu * - * $Id: bwlednum.cpp,v 1.8 1999/06/27 17:57:37 kulow Exp $ + * $Id: bwlednum.cpp,v 1.5 2003/06/25 15:01:53 jefft Exp $ * * $Log: bwlednum.cpp,v $ + * Revision 1.5 2003/06/25 15:01:53 jefft + * Merge with KDE 3.1.2 release + * * Revision 1.8 1999/06/27 17:57:37 kulow * fixes for --enable-final and other problems :) * diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/bwlednum.h kdemultimedia-3.1.4.19-4/kscd/bwlednum.h --- kdemultimedia-3.1.4/kscd/bwlednum.h 1999-06-27 19:57:37.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/bwlednum.h 2003-06-25 17:01:53.000000000 +0200 @@ -5,9 +5,12 @@ * Copyright: Bernd Johannes Wuebben, wuebben@math.cornell.edu * * - * $Id: bwlednum.h,v 1.6 1999/06/27 17:57:37 kulow Exp $ + * $Id: bwlednum.h,v 1.5 2003/06/25 15:01:53 jefft Exp $ * * $Log: bwlednum.h,v $ + * Revision 1.5 2003/06/25 15:01:53 jefft + * Merge with KDE 3.1.2 release + * * Revision 1.6 1999/06/27 17:57:37 kulow * fixes for --enable-final and other problems :) * diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/cddb.cpp kdemultimedia-3.1.4.19-4/kscd/cddb.cpp --- kdemultimedia-3.1.4/kscd/cddb.cpp 2002-12-07 06:07:58.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/kscd/cddb.cpp 2003-10-30 14:51:32.000000000 +0100 @@ -83,8 +83,10 @@ CDDB::CDDB(char *host, unsigned short in CDDB::~CDDB() { - delete sock; - sock = 0L; + if (sock) { + delete sock; + sock = 0L; + } timeouttimer.stop(); starttimer.stop(); } // ~CDDB @@ -407,7 +409,8 @@ CDDB::cddb_close() disconnect(sock, SIGNAL(connectionClosed()), this, SLOT(slotConnectionClosed())); disconnect(sock, SIGNAL(error(int)), this, SLOT(slotErrorConnection(int))); disconnect(sock,SIGNAL(readyRead()),this,SLOT(cddb_read())); - delete sock; + // Xandros bug 10549: Next line causes Qt 3.2 to crash if uncommented, don't know why -- jjt. + //delete sock; sock = 0L; } } // cddb_close diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/kscd.cpp kdemultimedia-3.1.4.19-4/kscd/kscd.cpp --- kdemultimedia-3.1.4/kscd/kscd.cpp 2003-09-09 01:41:12.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/kscd.cpp 2003-11-12 19:02:11.000000000 +0100 @@ -80,9 +80,7 @@ extern "C" { #include "bitmaps/rew.xbm" #include "bitmaps/info.xbm" #include "bitmaps/poweroff.xbm" -#ifdef KSCDMAGIC #include "bitmaps/magic.xbm" -#endif #include "bitmaps/eject.xbm" #include "bitmaps/db.xbm" #include "bitmaps/logo.xbm" @@ -172,7 +170,7 @@ class KSCDSlider : public QSlider *****************************************************************************/ KSCD::KSCD( QWidget *parent, const char *name ) - : DCOPObject( "CDPlayer" ), QWidget( parent, name, Qt::WDestructiveClose ) + : QWidget( parent, name, Qt::WDestructiveClose ), DCOPObject("CDPlayer") { magicproc = 0L; cd_device_str = ""; @@ -661,20 +659,23 @@ KSCD::setupPopups() purchPopup = new QPopupMenu (this); infoPopup = new QPopupMenu (this); - purchPopup->insertItem("CD Now", 0); + purchPopup->insertItem("Amazon.com", 0); purchPopup->insertItem("CD Universe", 1); perfPopup->insertItem("Tourdates.com", 0); - infoPopup->insertItem("Ultimate Bandlist", 0); + infoPopup->insertItem("MusicMoz", 0); + infoPopup->insertItem("Ultimate Bandlist", 1); infoPopup->insertSeparator(); - infoPopup->insertItem("Deja News", 1); - infoPopup->insertItem("Excite", 2); - infoPopup->insertItem("HotBot", 3); - infoPopup->insertItem("Info Seek", 4); - infoPopup->insertItem("Lycos", 5); - infoPopup->insertItem("Magellan", 6); - infoPopup->insertItem("Yahoo!", 7); + infoPopup->insertItem("AlltheWeb", 2); + infoPopup->insertItem("Altavista", 3); + infoPopup->insertItem("Excite", 4); + infoPopup->insertItem("Google", 5); + infoPopup->insertItem("Google Groups", 6); + infoPopup->insertItem("HotBot", 7); + infoPopup->insertItem("Lycos", 8); + infoPopup->insertItem("Open Directory", 9); + infoPopup->insertItem("Yahoo!", 10); mainPopup->insertItem (i18n("Purchases"), purchPopup); connect( purchPopup, SIGNAL(activated(int)), SLOT(purchases(int)) ); @@ -1023,16 +1024,31 @@ KSCD::quitClicked() void KSCD::closeEvent( QCloseEvent *e ) { - if (docking) - { - hide(); - e->ignore(); - return; - } + // Taken from KSCD CVS, KDE_3_1_BRANCH + // + // we need to figure out if we were called by the system tray + // to decide whether or not to actually quit or not =/ + // this behaviour of ksystemtray is, IMHO, very silly + const QObject* caller = sender(); + while (caller) + { + if (caller == dock_widget) + { + break; + } + caller = caller->parent(); + } + + if (docking && !caller && !kapp->sessionSaving()) + { + hide(); + e->ignore(); + return; + } - /* Stop playing the CD */ - if ( stopexit && cur_cdmode == WM_CDM_PLAYING ) - stopClicked(); + /* Stop playing the CD */ + if ( stopexit && cur_cdmode == WM_CDM_PLAYING ) + stopClicked(); writeSettings(); randomplay = FALSE; @@ -1742,7 +1758,7 @@ KSCD::readSettings() // Set this to false by default. Look at the settings dialog source code // for the reason. - Juraj. - cddb_remote_enabled = config->readBoolEntry( "CDDBRemoteEnabled", false ); + cddb_remote_enabled = config->readBoolEntry( "CDDBRemoteEnabled", true ); cddb.useHTTPProxy( config->readBoolEntry("CDDBHTTPProxyEnabled", KProtocolManager::useProxy()) ); KURL proxyURL; QString proxyHost; @@ -2557,7 +2573,7 @@ KSCD::purchases(int i) switch(i){ case 0: str = - QString("http://cdnow.com/switch/from=sr-288025/target=buyweb_products/artfs=%1") + QString("http://www.amazon.com/exec/obidos/external-search/002-9007616-4114464?mode=music&keyword=%1&Search=Search") .arg(artist); startBrowser(str); @@ -2643,62 +2659,73 @@ KSCD::information(int i) switch(i) { case 0: - str = - QString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch") + str = QString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1") + .arg(artist); + startBrowser(str); + break; + + case 1: + str = QString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch") .arg(artist); startBrowser(str); break; case 2: - str = - QString("http://x8.dejanews.com/dnquery.xp?QRY=%1&defaultOp=AND&svcclass=dncurrent&maxhits=20&ST=QS&format=terse&DBS=2") - .arg(artist); + str = QString("http://www.alltheweb.com/search?cat=web&q=%1") + .arg(artist); startBrowser(str); break; case 3: - str = - QString("http://www.excite.com/search.gw?c=web&search=%1&trace=a") - .arg(artist); + str = QString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx") + .arg(artist); startBrowser(str); break; case 4: - str = - QString("http://www.search.hotbot.com/hResult.html?SW=web&SM=MC&MT=%1&DC=10&DE=2&RG=NA&_v=2") - .arg(artist); + str = QString("http://msxml.excite.com/_1_2UDOUB70SVHVHR__info.xcite/dog/results?otmpl=dog/webresults.htm&qkw=%1&qcat=web&qk=20&top=1&start=&ver=14060") + .arg(artist); startBrowser(str); break; case 5: - str = - QString("http://www.infoseek.com/Titles?qt=%1&col=WW&sv=IS&lk=ip-noframes&nh=10") - .arg(artist); + str = QString("http://www.google.com/search?q=%1") + .arg(artist); startBrowser(str); break; case 6: - str = - QString("http://www.lycos.com/cgi-bin/pursuit?cat=lycos&query=%1") - .arg(artist); + str = QString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20") + .arg(artist); startBrowser(str); break; case 7: - str = - QString("http://www.mckinley.com/search.gw?search=%1&c=web&look=magellan") - .arg(artist); + str = QString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web") + .arg(artist); startBrowser(str); break; case 8: - str = - QString("http://search.yahoo.com/bin/search?p=%1") - .arg(artist); + str = QString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1") + .arg(artist); startBrowser(str); - break; + break; - default: + case 9: + str = QString("http://search.dmoz.org/cgi-bin/search?search=%1") + .arg(artist); + startBrowser(str); + break; + + case 10: + str = QString("http://search.yahoo.com/bin/search?p=%1") + .arg(artist); + startBrowser(str); + break; + + default: + return; break; } // switch() } // information @@ -3089,12 +3116,6 @@ KSCD::jumpTracks() jumpToTrack = 0; } // jumpTracks -bool -KSCD::playing() -{ - return ( cur_cdmode == WM_CDM_PLAYING ); -} - int KSCD::currentTrack() { return cur_track; @@ -3124,7 +3145,6 @@ void KSCD::clearSongList() songListCB->clear(); if (tooltips) { - QToolTip::remove(songListCB); QToolTip::add(songListCB, i18n("Track list")); } } @@ -3157,7 +3177,6 @@ void KSCD::setSongListTo(int whichTrack) QString justTheName = songListCB->currentText(); justTheName = justTheName.right(justTheName.length() - 4); - QToolTip::remove(songListCB); QToolTip::add(songListCB, i18n("Current Track: %1").arg(justTheName)); } } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/kscd.desktop kdemultimedia-3.1.4.19-4/kscd/kscd.desktop --- kdemultimedia-3.1.4/kscd/kscd.desktop 2003-05-07 13:46:51.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/kscd.desktop 2003-09-30 20:26:07.000000000 +0200 @@ -45,7 +45,7 @@ GenericName[zh_CN]=CD 播放器 GenericName[zh_TW]=CD 播放器 GenericName[zu]=Umdlali we CD BinaryPattern=kscd; -Name=KsCD +Name=CD Player Name[af]=Kscd Name[eo]=Lumdiskludilo Name[sv]=Kscd diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/kscd.h kdemultimedia-3.1.4.19-4/kscd/kscd.h --- kdemultimedia-3.1.4/kscd/kscd.h 2003-07-13 21:29:37.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/kscd.h 2003-03-26 21:41:27.000000000 +0100 @@ -113,10 +113,6 @@ class KSCD : public QWidget, public KSes k_dcop: - /** - * Check KsCD's current state - */ - bool playing(); void play() { playClicked(); } void stop() { stopClicked(); } void previous() { prevClicked(); } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/kscd/kscdmagic/Makefile.am kdemultimedia-3.1.4.19-4/kscd/kscdmagic/Makefile.am --- kdemultimedia-3.1.4/kscd/kscdmagic/Makefile.am 2000-05-25 16:07:12.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/kscd/kscdmagic/Makefile.am 2003-02-12 21:09:43.000000000 +0100 @@ -13,7 +13,7 @@ # kde_wallpaperdir Where general wallpapers should go to. # just set the variable -APPSDIR = $(kde_appsdir)/Multimedia +APPSDIR = $(kde_appsdir)/Applications/Multimedia # set the include path for X, qt and KDE INCLUDES= $(all_includes) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib/configure.in.in kdemultimedia-3.1.4.19-4/mpeglib/configure.in.in --- kdemultimedia-3.1.4/mpeglib/configure.in.in 2002-10-05 09:49:37.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib/configure.in.in 2003-08-18 22:40:57.000000000 +0200 @@ -88,7 +88,7 @@ AC_TRY_COMPILE([ AC_MSG_RESULT($x11_dga2) if test x$x11_dga2 = xyes; then AC_DEFINE(X11_DGA2,1,[Define if you have XFree4.0 DGA 2.0]) - DGALIBS="-lXxf86dga" + DGALIBS="-lXxf86dga_pic" fi AC_MSG_CHECKING(for X11 video extension) @@ -118,7 +118,7 @@ AC_TRY_COMPILE([ AC_MSG_RESULT($x11_xvidmode) if test x$x11_xvidmode = xyes; then AC_DEFINE(X11_XVIDMODE,1,[Define if you have XVidModeextension]) - XVIDMODELIBS="-lXxf86vm" + XVIDMODELIBS="-lXxf86vm_pic" fi diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib/lib/input/cdromAccess_Linux.cpp kdemultimedia-3.1.4.19-4/mpeglib/lib/input/cdromAccess_Linux.cpp --- kdemultimedia-3.1.4/mpeglib/lib/input/cdromAccess_Linux.cpp 2003-09-02 03:18:23.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib/lib/input/cdromAccess_Linux.cpp 2003-02-03 16:33:03.000000000 +0100 @@ -10,12 +10,10 @@ */ -typedef unsigned long long __u64; #include "cdromToc.h" #include "cdromRawAccess.h" #include -#define _LINUX_BYTEORDER_SWAB_H #include #include diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib/lib/mpegplay/mainMpegPlay.cpp kdemultimedia-3.1.4.19-4/mpeglib/lib/mpegplay/mainMpegPlay.cpp --- kdemultimedia-3.1.4/mpeglib/lib/mpegplay/mainMpegPlay.cpp 2000-07-27 17:24:55.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib/lib/mpegplay/mainMpegPlay.cpp 2003-07-25 15:18:29.000000000 +0200 @@ -8,8 +8,8 @@ g++ -DINTEL -I/usr/X11R6/include -I.. \ -o mpegplay mainMpegPlay.cpp -L/usr/X11R6/lib \ - ../.libs/libmpeg.a -lX11 -lXext -lXv -lXxf86dga \ - -lXxf86dga -lpthread + ../.libs/libmpeg.a -lX11 -lXext -lXv_pic -lXxf86dga_pic \ + -lXxf86dga_pic -lpthread */ diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib/lib/util/mmx/Makefile.am kdemultimedia-3.1.4.19-4/mpeglib/lib/util/mmx/Makefile.am --- kdemultimedia-3.1.4/mpeglib/lib/util/mmx/Makefile.am 2003-09-08 20:04:11.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib/lib/util/mmx/Makefile.am 2002-05-28 22:55:39.000000000 +0200 @@ -3,7 +3,7 @@ # For cpu_accel compile we cannot have ansi # (I dont have debugged why) -AM_CFLAGS = -O2 +CFLAGS = -O2 INCLUDES = $(all_includes) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib/lib/util/mmx/cpu_accel.c kdemultimedia-3.1.4.19-4/mpeglib/lib/util/mmx/cpu_accel.c --- kdemultimedia-3.1.4/mpeglib/lib/util/mmx/cpu_accel.c 2003-09-11 21:12:17.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib/lib/util/mmx/cpu_accel.c 2002-05-28 22:55:39.000000000 +0200 @@ -40,7 +40,7 @@ static uint32_t arch_accel (void) #ifndef PIC #define cpuid(op,eax,ebx,ecx,edx) \ - __asm ("cpuid" \ + asm ("cpuid" \ : "=a" (eax), \ "=b" (ebx), \ "=c" (ecx), \ @@ -49,7 +49,7 @@ static uint32_t arch_accel (void) : "cc") #else /* PIC version : save ebx */ #define cpuid(op,eax,ebx,ecx,edx) \ - __asm ("pushl %%ebx\n\t" \ + asm ("pushl %%ebx\n\t" \ "cpuid\n\t" \ "movl %%ebx,%1\n\t" \ "popl %%ebx" \ @@ -61,7 +61,7 @@ static uint32_t arch_accel (void) : "cc") #endif - __asm ("pushfl\n\t" + asm ("pushfl\n\t" "pushfl\n\t" "popl %0\n\t" "movl %0,%1\n\t" @@ -137,7 +137,7 @@ static uint32_t arch_accel (void) canjump = 1; - __asm volatile ("mtspr 256,%0" :: "r" (-1)); + asm volatile ("mtspr 256,%0" :: "r" (-1)); signal (SIGILL, SIG_DFL); return MM_ACCEL_PPC_ALTIVEC; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h kdemultimedia-3.1.4.19-4/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h --- kdemultimedia-3.1.4/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h 2003-09-02 03:18:27.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h 2002-05-28 22:55:41.000000000 +0200 @@ -18,18 +18,6 @@ #ifndef __RGB2YUVDEFS_H #define __RGB2YUVDEFS_H -/* gcc 3.3.1 and later optimise the "not used" (only in asm code) - symbols away. So we need to mark them as used. */ -#ifdef __GNUC_PREREQ -#if __GNUC_PREREQ (3,1) -# define __attribute_used__ __attribute__ ((__used__)) -#else -# define __attribute_used__ -#endif -#else -# define __attribute_used__ -#endif - // hicolor mode (16 bit) with r(5) g(6) b(5) bits (reverse order b, g, r) #define RED(rgb) (unsigned char) ((rgb) << 3) #define GREEN(rgb) (((rgb) & 0x7e0) >> 3) @@ -52,20 +40,20 @@ #define U_RGB(R,G,B) ((( U_R * (R) + U_G * (G) + U_B * (B)) >> YUV_SHIFT) + 128) #define V_RGB(R,G,B) ((( V_R * (R) + V_G * (G) + V_B * (B)) >> YUV_SHIFT) + 128) -static unsigned char __attribute_used__ CLEARX[8] = { 255, 0, 255, 0, 255, 0, 255, 0 }; -static short __attribute_used__ ZEROSX[4] = { 0, 0, 0, 0 }; +static unsigned char CLEARX[8] = { 255, 0, 255, 0, 255, 0, 255, 0 }; +static short ZEROSX[4] = { 0, 0, 0, 0 }; -static short __attribute_used__ OFFSETDX[4] = { 0, 64, 0, 64 }; -static short __attribute_used__ OFFSETWX[4] = { 128, 0, 128, 0 }; -static short __attribute_used__ OFFSETBX[4] = { 128, 128, 128, 128 }; +static short OFFSETDX[4] = { 0, 64, 0, 64 }; +static short OFFSETWX[4] = { 128, 0, 128, 0 }; +static short OFFSETBX[4] = { 128, 128, 128, 128 }; -static short __attribute_used__ YR0GRX[4] = { Y_R, Y_G, 0, Y_R }; -static short __attribute_used__ YBG0BX[4] = { Y_B, 0, Y_G, Y_B }; +static short YR0GRX[4] = { Y_R, Y_G, 0, Y_R }; +static short YBG0BX[4] = { Y_B, 0, Y_G, Y_B }; -static short __attribute_used__ UR0GRX[4] = { U_R, U_G, 0, U_R }; -static short __attribute_used__ UBG0BX[4] = { U_B, 0, U_G, U_B }; +static short UR0GRX[4] = { U_R, U_G, 0, U_R }; +static short UBG0BX[4] = { U_B, 0, U_G, U_B }; -static short __attribute_used__ VR0GRX[4] = { V_R, V_G, 0, V_R }; -static short __attribute_used__ VBG0BX[4] = { V_B, 0, V_G, V_B }; +static short VR0GRX[4] = { V_R, V_G, 0, V_R }; +static short VBG0BX[4] = { V_B, 0, V_G, V_B }; #endif diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/mpeglib_artsplug/README kdemultimedia-3.1.4.19-4/mpeglib_artsplug/README --- kdemultimedia-3.1.4/mpeglib_artsplug/README 2000-07-04 21:36:50.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/mpeglib_artsplug/README 2003-07-25 15:18:29.000000000 +0200 @@ -33,8 +33,8 @@ * You should edit the Makefile and remove the XFree4.0 dependecies Makefile: - -lmpeg -lX11 -lXext -lXt -lXv -lXxf86dga -lpthread -# ^^^^^^^^^^^^^^^ + -lmpeg -lX11 -lXext -lXt -lXv_pic -lXxf86dga_pic -lpthread +# ^^^^^^^^^^^^^^^^^^^^^^^ # needed if you have XFree4.0 diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/Makefile.am kdemultimedia-3.1.4.19-4/noatun/Makefile.am --- kdemultimedia-3.1.4/noatun/Makefile.am 2003-05-07 13:46:52.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/Makefile.am 2003-02-12 21:09:43.000000000 +0100 @@ -22,7 +22,7 @@ dummy.cpp: echo > dummy.cpp applnk_DATA = noatun.desktop -applnkdir = $(kde_appsdir)/Multimedia +applnkdir = $(kde_appsdir)/Applications/Multimedia presetsdir = $(kde_datadir)/noatun/eq.preset presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/.cvsignore kdemultimedia-3.1.4.19-4/noatun/library/.cvsignore --- kdemultimedia-3.1.4/noatun/library/.cvsignore 2003-07-13 21:29:42.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/.cvsignore 2002-05-28 22:55:59.000000000 +0200 @@ -6,3 +6,4 @@ artsvideo.h gdb-transcript gentable magictable +noatun diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/effectview.cpp kdemultimedia-3.1.4.19-4/noatun/library/effectview.cpp --- kdemultimedia-3.1.4/noatun/library/effectview.cpp 2002-08-29 05:01:05.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/effectview.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -101,7 +101,7 @@ void EffectView::init(void) if(initialized) return; initialized = true; - setCaption(i18n("Effects - Noatun")); + setCaption(i18n("Effects - Media Player")); setIcon(SmallIcon("effect")); // Create widgets and layouts diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/engine.cpp kdemultimedia-3.1.4.19-4/noatun/library/engine.cpp --- kdemultimedia-3.1.4/noatun/library/engine.cpp 2003-07-13 21:29:42.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/engine.cpp 2003-03-26 21:41:28.000000000 +0100 @@ -363,7 +363,6 @@ void Engine::seek(int msec) // pass time Arts::poTime t; - t.custom = 0.0; t.ms = (long) msec % 1000; t.seconds = (long) (msec - t.ms) / 1000; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/ksaver.cpp kdemultimedia-3.1.4.19-4/noatun/library/ksaver.cpp --- kdemultimedia-3.1.4/noatun/library/ksaver.cpp 2003-07-13 21:29:42.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/ksaver.cpp 2002-05-28 22:56:02.000000000 +0200 @@ -91,11 +91,11 @@ bool Noatun::KSaver::open(void) bool Noatun::KSaver::close(void) { - delete d->textStream; - d->textStream = 0; + if(d->textStream) + d->textStream = 0; - delete d->dataStream; - d->dataStream = 0; + if(d->dataStream) + d->dataStream = 0; if(d->isLocal) { diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/noatunarts/StereoVolumeControl_impl.cpp kdemultimedia-3.1.4.19-4/noatun/library/noatunarts/StereoVolumeControl_impl.cpp --- kdemultimedia-3.1.4/noatun/library/noatunarts/StereoVolumeControl_impl.cpp 2003-09-02 03:18:32.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/noatunarts/StereoVolumeControl_impl.cpp 2003-02-03 16:33:04.000000000 +0100 @@ -88,19 +88,19 @@ public: __asm__ __volatile__( "pushl $100 \n" "fildl (%%esp) \n" -#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) +#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ == 2) "addl $4, %%esp \n" #endif "fildl %5 \n" "fdivp \n" // percent / 100.0 -#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) +#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ == 2) "pushl $100 \n" #endif "fstps (%%esp) \n" "movss (%%esp), %%xmm1 \n" "shufps $0x00, %%xmm1, %%xmm1 \n" // percentage in all of xmm1 "addl $4, %%esp \n" -#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) +#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ == 2) "subl $4, %4 \n" "jl .l2 \n" // samples < 4 #else @@ -124,7 +124,7 @@ public: "incl %%ecx \n" "incl %%ecx \n" -#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) +#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ == 2) "subl $4, %4 \n" "jge .l1 \n" ".l2: \n" diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/pref.cpp kdemultimedia-3.1.4.19-4/noatun/library/pref.cpp --- kdemultimedia-3.1.4/noatun/library/pref.cpp 2003-07-13 21:29:42.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/pref.cpp 2003-03-26 21:41:28.000000000 +0100 @@ -75,7 +75,7 @@ void CModule::ownerDeleted() { QObject *p=parent(); delete this; - //delete p; + delete p; } #include diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/scrollinglabel.cpp kdemultimedia-3.1.4.19-4/noatun/library/scrollinglabel.cpp --- kdemultimedia-3.1.4/noatun/library/scrollinglabel.cpp 2003-09-02 03:18:32.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/scrollinglabel.cpp 2002-05-28 22:56:03.000000000 +0200 @@ -92,7 +92,6 @@ ScrollingLabel::setText(const QString & _update(); } - QToolTip::remove(this); QToolTip::add(this, d->text); } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/library/video.cpp kdemultimedia-3.1.4.19-4/noatun/library/video.cpp --- kdemultimedia-3.1.4/noatun/library/video.cpp 2002-10-13 22:14:46.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/library/video.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -116,7 +116,7 @@ void VideoFrame::stopped() GlobalVideo::GlobalVideo() : QWidget( 0, 0, WType_TopLevel | WStyle_Customize | WStyle_DialogBorder | WStyle_Title ) { - setCaption(i18n("Video - Noatun")); + setCaption(i18n("Video - Media Player")); (new QVBoxLayout(this))->setAutoAdd(true); video = new VideoFrame(this); menu = video->popupMenu(this); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/main.cpp kdemultimedia-3.1.4.19-4/noatun/main.cpp --- kdemultimedia-3.1.4/noatun/main.cpp 2003-05-07 13:46:52.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/main.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -26,7 +26,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData("noatun", I18N_NOOP("Noatun"), + KAboutData aboutData("noatun", I18N_NOOP("Media Player"), version, description, KAboutData::License_BSD, I18N_NOOP("(c) 2000-2002, The Noatun Developers"), 0, "http://noatun.kde.org"); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/artseffects/artseffects.h kdemultimedia-3.1.4.19-4/noatun/modules/artseffects/artseffects.h --- kdemultimedia-3.1.4/noatun/modules/artseffects/artseffects.h 2003-07-13 21:29:43.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/artseffects/artseffects.h 2003-03-26 21:41:28.000000000 +0100 @@ -66,7 +66,6 @@ public: void dispatch(Arts::Buffer *request, Arts::Buffer *result,long methodID); }; -#include "reference.h" class ExtraStereo : public Arts::Object { private: static Arts::Object_base* _Creator(); @@ -161,7 +160,6 @@ public: void dispatch(Arts::Buffer *request, Arts::Buffer *result,long methodID); }; -#include "reference.h" class VoiceRemoval : public Arts::Object { private: static Arts::Object_base* _Creator(); @@ -254,7 +252,6 @@ public: void dispatch(Arts::Buffer *request, Arts::Buffer *result,long methodID); }; -#include "reference.h" class RawWriter : public Arts::Object { private: static Arts::Object_base* _Creator(); @@ -347,7 +344,6 @@ public: void dispatch(Arts::Buffer *request, Arts::Buffer *result,long methodID); }; -#include "reference.h" class ExtraStereoGuiFactory : public Arts::Object { private: static Arts::Object_base* _Creator(); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/excellent/userinterface.cpp kdemultimedia-3.1.4.19-4/noatun/modules/excellent/userinterface.cpp --- kdemultimedia-3.1.4/noatun/modules/excellent/userinterface.cpp 2003-05-07 13:46:53.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/excellent/userinterface.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -149,7 +149,7 @@ Excellent::Excellent() connect(slider, SIGNAL(sliderMoved(int)), SLOT(sliderMoved(int))); - setCaption("Noatun"); + setCaption("Media Player"); setIcon(SmallIcon("noatun")); changeLoopType(Player::None); changeStatusbar(); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/kjofol-skin/kjloader.cpp kdemultimedia-3.1.4.19-4/noatun/modules/kjofol-skin/kjloader.cpp --- kdemultimedia-3.1.4/noatun/modules/kjofol-skin/kjloader.cpp 2003-05-07 13:46:53.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/kjofol-skin/kjloader.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -110,7 +110,7 @@ KJLoader::KJLoader(void) mTooltips = new KJToolTip(this); // Windowname and Icon - setCaption ( i18n("Noatun") ); + setCaption ( i18n("Media Player") ); setIcon ( SmallIcon("noatun") ); setAcceptDrops ( true ); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/liszt/EditWidget.cpp kdemultimedia-3.1.4.19-4/noatun/modules/liszt/EditWidget.cpp --- kdemultimedia-3.1.4/noatun/modules/liszt/EditWidget.cpp 2000-11-19 22:06:37.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/noatun/modules/liszt/EditWidget.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -17,7 +17,7 @@ LICENSE EditWidget::EditWidget() : QWidget(0, "Liszt edit widget") { - setCaption("Liszt - Noatun"); + setCaption("Liszt - Media Player"); QFont f(font()); f.setPixelSize(12); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/liszt/liszt.plugin kdemultimedia-3.1.4.19-4/noatun/modules/liszt/liszt.plugin --- kdemultimedia-3.1.4/noatun/modules/liszt/liszt.plugin 2003-07-14 16:16:21.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/liszt/liszt.plugin 2003-06-25 17:01:53.000000000 +0200 @@ -11,7 +11,6 @@ Comment=A fancy playlist Comment[af]='n deftige liedjielys Comment[ar]=قائمة أغاني جميلة المظهر Comment[az]=Rəngli bir çalma siyahısı -Comment[bg]=Пъстър списък за просвирване Comment[bs]=Dobra playlista Comment[ca]=Una llista de cançons fantàstica Comment[cs]=Efektní seznam skladeb @@ -32,7 +31,7 @@ Comment[is]=Flottur lagalisti Comment[it]=Una playlist divertente Comment[ja]=ファンシーなプレイリスト Comment[ko]=보기 좋은 연주 목록 -Comment[lt]=Įmantrus gaidaraštis +Comment[lt]=Įdomus gaidaraštis Comment[lv]=Fantastisks plejlists Comment[mk]=Необична плеј листа Comment[mt]=Playlist sofistikata diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/monoscope/monoscope.plugin kdemultimedia-3.1.4.19-4/noatun/modules/monoscope/monoscope.plugin --- kdemultimedia-3.1.4/noatun/modules/monoscope/monoscope.plugin 2003-09-02 12:47:37.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/monoscope/monoscope.plugin 2003-06-25 17:01:53.000000000 +0200 @@ -45,7 +45,7 @@ Comment[en_GB]=A neat waveform scope ana Comment[eo]=Uzinda ondo-analizilo Comment[es]=Un analizador elegante de formas de onda Comment[et]=Nunnu signaalikuju analüsaator -Comment[fi]=Nätti oskilloskooppi +Comment[fi]=Nätti oskiloskooppi Comment[fr]=Un bel analyseur de spectre Comment[he]=מאבחן תחומי גל Comment[hr]=Simpatičan analizator zvuka diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/noatunui/userinterface.cpp kdemultimedia-3.1.4.19-4/noatun/modules/noatunui/userinterface.cpp --- kdemultimedia-3.1.4/noatun/modules/noatunui/userinterface.cpp 2002-09-15 23:21:17.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/noatunui/userinterface.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -135,7 +135,7 @@ MilkChocolate::MilkChocolate() : QWidget for (QPtrListIterator i(*children()); i.current(); ++i) (*i)->installEventFilter(this); - setCaption("Noatun"); + setCaption("Media Player"); setIcon(BarIcon("noatun")); show(); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/simple/eject.xpm kdemultimedia-3.1.4.19-4/noatun/modules/simple/eject.xpm --- kdemultimedia-3.1.4/noatun/modules/simple/eject.xpm 1970-01-01 01:00:00.000000000 +0100 +++ kdemultimedia-3.1.4.19-4/noatun/modules/simple/eject.xpm 2002-06-10 19:43:35.000000000 +0200 @@ -0,0 +1,21 @@ +/* XPM */ +const char * eject_xpm[] = { +"16 16 2 1", +" c None", +". c #000000", +" ", +" ", +" .. ", +" .... ", +" ...... ", +" ........ ", +" .......... ", +" .......... ", +" ", +" ", +" .......... ", +" .......... ", +" .......... ", +" .......... ", +" ", +" "}; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/simple/playlist.xpm kdemultimedia-3.1.4.19-4/noatun/modules/simple/playlist.xpm --- kdemultimedia-3.1.4/noatun/modules/simple/playlist.xpm 2003-06-14 22:44:28.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/simple/playlist.xpm 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -/* XPM */ -const char * playlist_xpm[] = { -"16 16 2 1", -" c None", -". c #000000", -" ", -" ", -" .. ", -" .... ", -" ...... ", -" ........ ", -" .......... ", -" .......... ", -" ", -" ", -" .......... ", -" .......... ", -" .......... ", -" .......... ", -" ", -" "}; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/simple/simple.plugin kdemultimedia-3.1.4.19-4/noatun/modules/simple/simple.plugin --- kdemultimedia-3.1.4/noatun/modules/simple/simple.plugin 2003-07-13 21:29:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/simple/simple.plugin 2003-06-25 17:01:53.000000000 +0200 @@ -57,7 +57,6 @@ Name[zh_TW]=簡單 Name[zu]=Okulula Comment=Simple GUI (embedded video) Comment[af]=Eenvoudige Gui (ingebedde video) -Comment[bg]=Прост ГПИ (с вградено видео) Comment[bs]=Jednostavan GUI (uključen video) Comment[ca]=GUI senzill (vídeo incrustat) Comment[cs]=Jednoduché GUI (vnořené video) diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/simple/userinterface.cpp kdemultimedia-3.1.4.19-4/noatun/modules/simple/userinterface.cpp --- kdemultimedia-3.1.4/noatun/modules/simple/userinterface.cpp 2003-07-13 21:29:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/simple/userinterface.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -37,19 +37,18 @@ #include "userinterface.h" #include "back.xpm" +#include "eject.xpm" #include "forward.xpm" #include "pause.xpm" #include "play.xpm" -#include "playlist.xpm" #include "stop.xpm" -#include "volume.xpm" SimpleUI::SimpleUI() : KMainWindow(), UserInterface() { setAcceptDrops( true ); - setCaption( i18n("Noatun") ); + setCaption( i18n("Media Player") ); setIcon( SmallIcon( "noatun" ) ); setupCentralWidget(); @@ -84,14 +83,13 @@ SimpleUI::SimpleUI() statusBar()->show(); - connect( napp->player(), SIGNAL(playing()), SLOT(slotPlaying()) ); - connect( napp->player(), SIGNAL(stopped()), SLOT(slotStopped()) ); - connect( napp->player(), SIGNAL(paused()), SLOT(slotPaused()) ); - connect( napp->player(), SIGNAL(timeout()), SLOT(slotTimeout()) ); - connect( napp->player(), SIGNAL(newSong()), SLOT(slotChanged()) ); - connect( napp->player(), SIGNAL(volumeChanged(int)), SLOT(slotVolumeChanged(int)) ); - connect( napp, SIGNAL(hideYourself()), SLOT(hide()) ); - connect( napp, SIGNAL(showYourself()), SLOT(show()) ); + connect( napp->player(), SIGNAL(playing()), this, SLOT(slotPlaying()) ); + connect( napp->player(), SIGNAL(stopped()), this, SLOT(slotStopped()) ); + connect( napp->player(), SIGNAL(paused()), this, SLOT(slotPaused()) ); + connect( napp->player(), SIGNAL(timeout()), this, SLOT(slotTimeout()) ); + connect( napp->player(), SIGNAL(newSong()), this, SLOT(slotChanged()) ); + connect( napp, SIGNAL(hideYourself()), this, SLOT(hide()) ); + connect( napp, SIGNAL(showYourself()), this, SLOT(show()) ); napp->player()->handleButtons(); @@ -169,9 +167,9 @@ void SimpleUI::setupCentralWidget() video = new VideoFrame( npWidget ); connect( video, SIGNAL(adaptSize(int,int)), - SLOT(slotAdaptSize(int,int)) ); + this, SLOT(slotAdaptSize(int,int)) ); connect( video, SIGNAL(rightButtonPressed(const QPoint &)), - SLOT(slotContextMenu(const QPoint &)) ); + this, SLOT(slotContextMenu(const QPoint &)) ); QHBox *ctlFrame = new QHBox( npWidget ); ctlFrame->setFixedHeight( 38 ); @@ -208,39 +206,14 @@ void SimpleUI::setupCentralWidget() slider->setFixedHeight( 24 ); slider->setMinimumWidth( 100 ); slider->setTickmarks( QSlider::NoMarks ); - connect( slider, SIGNAL(userChanged(int)), SLOT(slotSkipTo(int)) ); - connect( slider, SIGNAL(sliderMoved(int)), SLOT(slotSliderMoved(int)) ); - - QPushButton *playlistButton = new QPushButton( ctlFrame ); - playlistButton->setFixedSize( 24, 24 ); - playlistButton->setPixmap( QPixmap( playlist_xpm ) ); - QToolTip::add( playlistButton, i18n("Playlist") ); - connect( playlistButton, SIGNAL(clicked()), napp->player(), SLOT(toggleListView()) ); - - volumeButton = new QPushButton( ctlFrame ); - volumeButton->setFixedSize( 24, 24 ); - volumeButton->setPixmap( QPixmap( volume_xpm ) ); - QToolTip::add( volumeButton, i18n("Volume") ); - - volumeFrame = new QVBox( this, "Volume", WStyle_Customize | WType_Popup ); - volumeFrame->setFrameStyle( QFrame::PopupPanel ); - volumeFrame->setMargin( 4 ); - - volumeLabel = new QLabel( volumeFrame ); - volumeLabel->setText( "100%" ); - volumeLabel->setAlignment( AlignCenter ); - volumeLabel->setFixedSize( volumeLabel->sizeHint() ); - - QHBox *volumeSubFrame = new QHBox( volumeFrame ); - volumeSlider = new L33tSlider( 0, 100, 10, 0, Vertical, volumeSubFrame ); - volumeSlider->setValue( 100 - napp->player()->volume() ); - volumeSlider->setFixedSize( volumeSlider->sizeHint() ); - - volumeFrame->resize( volumeFrame->sizeHint() ); + connect( slider, SIGNAL(userChanged(int)), this, SLOT(slotSkipTo(int)) ); + connect( slider, SIGNAL(sliderMoved(int)), this, SLOT(slotSliderMoved(int)) ); - connect( volumeSlider, SIGNAL(sliderMoved(int)), SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeSlider, SIGNAL(userChanged(int)), SLOT(slotVolumeSliderMoved(int)) ); - connect( volumeButton, SIGNAL(clicked()), SLOT(slotVolumeFrame()) ); + QPushButton *ejectButton = new QPushButton( ctlFrame ); + ejectButton->setFixedSize( 24, 24 ); + ejectButton->setPixmap( QPixmap( eject_xpm ) ); + QToolTip::add( ejectButton, i18n("Eject") ); + connect( ejectButton, SIGNAL(clicked()), napp->player(), SLOT(toggleListView()) ); setCentralWidget( npWidget ); @@ -258,17 +231,17 @@ void SimpleUI::closeEvent( QCloseEvent * void SimpleUI::dragEnterEvent( QDragEnterEvent *event ) { - event->accept( KURLDrag::canDecode( event ) ); + event->accept( QUriDrag::canDecode( event ) ); } void SimpleUI::dropEvent( QDropEvent *event ) { - KURL::List uri; - - if (KURLDrag::decode( event, uri )) - { - napp->player()->openFile( uri, false ); - } + KURL::List uri; + if (KURLDrag::decode(event, uri)) + { + for (KURL::List::Iterator i = uri.begin(); i != uri.end(); ++i) + napp->player()->openFile(*i, false); + } } void SimpleUI::slotAdaptSize( int width, int height ) @@ -302,6 +275,16 @@ void SimpleUI::slotPaused() slider->setEnabled( true ); } +void SimpleUI::slotVolumeUp() +{ + napp->player()->setVolume( QMIN( 100, (napp->player()->volume() + 8) ) ); +} + +void SimpleUI::slotVolumeDown() +{ + napp->player()->setVolume( QMAX( 0, (napp->player()->volume() - 8) ) ); +} + void SimpleUI::slotTimeout() { if (napp->player()->current() && !slider->currentlyPressed()) @@ -334,31 +317,4 @@ void SimpleUI::slotSliderMoved( int sec positionLabel->setText( napp->player()->lengthString( sec * 1000 ) ); } -void SimpleUI::slotVolumeChanged( int volume ) -{ - volumeLabel->setText( QString::number( volume ) + "%" ); - volumeSlider->setValue( 100 - volume ); -} - -void SimpleUI::slotVolumeFrame() -{ - if (volumeFrame->isVisible()) - { - volumeFrame->hide(); - } - else - { - int x = (volumeButton->width() - volumeFrame->width()) / 2; - int y = -(volumeFrame->height() + 5); - - volumeFrame->move( volumeButton->mapToGlobal( QPoint( x, y ) ) ); - volumeFrame->show(); - } -} - -void SimpleUI::slotVolumeSliderMoved( int slider ) -{ - napp->player()->setVolume( 100 - slider ); -} - #include "userinterface.moc" diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/simple/userinterface.h kdemultimedia-3.1.4.19-4/noatun/modules/simple/userinterface.h --- kdemultimedia-3.1.4/noatun/modules/simple/userinterface.h 2003-07-13 21:29:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/simple/userinterface.h 2003-06-25 17:01:53.000000000 +0200 @@ -21,7 +21,6 @@ #include #include #include -#include #include "propertiesdialog.h" @@ -46,6 +45,8 @@ public slots: void slotPlaying(); void slotStopped(); void slotPaused(); + void slotVolumeUp(); + void slotVolumeDown(); void slotTimeout(); void slotSkipTo( int sec ); void slotChanged(); @@ -53,21 +54,14 @@ public slots: private slots: void slotSliderMoved( int sec ); - void slotVolumeSliderMoved( int volume ); - void slotVolumeFrame(); - void slotVolumeChanged( int volume ); private: PropertiesDialog *propertiesDialog; QPopupMenu *contextMenu; QPushButton *stopButton; QPushButton *playButton; - QPushButton *volumeButton; - QVBox *volumeFrame; - QLabel *volumeLabel; QLabel *positionLabel; VideoFrame *video; - L33tSlider *volumeSlider; L33tSlider *slider; int extra_width; int extra_height; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/simple/volume.xpm kdemultimedia-3.1.4.19-4/noatun/modules/simple/volume.xpm --- kdemultimedia-3.1.4/noatun/modules/simple/volume.xpm 2003-06-14 22:44:28.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/simple/volume.xpm 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -/* XPM */ -const char * volume_xpm[] = { -"16 16 2 1", -" c None", -". c #000000", -" ", -" ", -" . .. ", -" .. . . ", -" .... . . ", -" .... . . ", -" .. .. . ", -" . ... . ", -" .... . ", -" ..... . ", -" ...... . ", -" ....... . ", -" ........ . ", -" ............ ", -" ", -" "}; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/splitplaylist/splitplaylist.plugin kdemultimedia-3.1.4.19-4/noatun/modules/splitplaylist/splitplaylist.plugin --- kdemultimedia-3.1.4/noatun/modules/splitplaylist/splitplaylist.plugin 2003-07-13 21:29:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/splitplaylist/splitplaylist.plugin 2003-06-25 17:01:53.000000000 +0200 @@ -8,7 +8,6 @@ Name=Split Playlist Name[af]=Skei Liedjielys Name[ar]=تقسيم قائمة الأغاني Name[az]=Çalma Siyahısını Ayır -Name[bg]=Разделя списъка за просвирване Name[bs]=Podijeli playlistu Name[ca]=Dividir la selecció de peces Name[cs]=Oddělovací seznam skladeb @@ -55,7 +54,6 @@ Comment=The innacurately titled playlist Comment[af]=Die onakurate getitelde liedjielys Comment[ar]=لائحة الأغاني غير المنظمة Comment[az]=Qarışıq başlıqlı çalma siyahısı -Comment[bg]=Неправилно озаглавен списък Comment[bs]=Neispravno naslovljena playlista Comment[ca]=Selecció de peces titolades inexactament Comment[cs]=Nesprávně pojmenovaný seznam skladeb diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/splitplaylist/view.cpp kdemultimedia-3.1.4.19-4/noatun/modules/splitplaylist/view.cpp --- kdemultimedia-3.1.4/noatun/modules/splitplaylist/view.cpp 2003-09-02 03:18:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/splitplaylist/view.cpp 2003-02-03 16:33:04.000000000 +0100 @@ -125,7 +125,32 @@ SafeListViewItem::SafeListViewItem(QList SafeListViewItem::~SafeListViewItem() { - remove(); + removed=true; + if (napp->player()->current()==this && !itemAbove() && !itemBelow()) + { + napp->player()->stop(); + SPL->setCurrent(0); + } + else if (napp->player()->current()==this) + { + SPL->setCurrent(0); + if (!SPL->exiting()) + napp->player()->forward(); + } + + if (SPL->nextItem==this) + SPL->setNext(static_cast(itemBelow())); + if (SPL->currentItem==this) // just optimizing for least unreadably + SPL->setCurrent(0), SPL->setNext(static_cast(itemBelow())); + if (SPL->previousItem==this) + SPL->setPrevious(static_cast(itemAbove())); + + PlaylistItemData::removed(); +} + +void SafeListViewItem::removeMe() +{ + delete this; } QString SafeListViewItem::file() const @@ -314,31 +339,7 @@ void SafeListViewItem::stateChange(bool void SafeListViewItem::remove() { - removed=true; - if (napp->player()->current()==this && !itemAbove() && !itemBelow()) - { - napp->player()->stop(); - SPL->setCurrent(0); - napp->player()->playCurrent(); - } - else if (napp->player()->current()==this) - { - SPL->setCurrent(0); - napp->player()->playCurrent(); - if (!SPL->exiting()) - napp->player()->forward(); - } - - if (SPL->nextItem==this) - SPL->setNext(static_cast(itemBelow())); - if (SPL->currentItem==this) // just optimizing for least unreadably - SPL->setCurrent(0), SPL->setNext(static_cast(itemBelow())); - if (SPL->previousItem==this) - SPL->setPrevious(static_cast(itemAbove())); - - if (listView()) - listView()->takeItem(this); - PlaylistItemData::removed(); + delete this; } List::List(View *parent) @@ -873,9 +874,9 @@ void List::clear() void View::deleteSelected() { - QPtrList items(list->selectedItems()); - for (QPtrListIterator it(items); it.current(); ++it) - static_cast(*it)->remove(); + QList items(list->selectedItems()); + for (QListIterator it(items); it.current(); ++it) + static_cast(*it)->removeMe(); setModified(true); } diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/splitplaylist/view.h kdemultimedia-3.1.4.19-4/noatun/modules/splitplaylist/view.h --- kdemultimedia-3.1.4/noatun/modules/splitplaylist/view.h 2003-09-02 03:18:45.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/splitplaylist/view.h 2002-07-08 20:12:39.000000000 +0200 @@ -15,7 +15,7 @@ class View; namespace KIO { class ListJob; } -class SafeListViewItem +class SafeListViewItem : public QCheckListItem , public PlaylistItemData , public DownloadItem @@ -31,10 +31,11 @@ public: virtual QStringList properties() const; virtual bool isProperty(const QString &) const; - virtual QString file() const; + void removeMe(); + virtual QString file() const; + int compare(QListViewItem * i, int col, bool ascending) const; - virtual void remove(); protected: virtual void downloaded(int percent); @@ -42,6 +43,7 @@ protected: virtual void downloadFinished(); virtual void modified(); virtual void stateChange(bool s); + virtual void remove(); private: struct Property @@ -77,14 +79,14 @@ protected: virtual void viewportPaintEvent(QPaintEvent *); virtual void keyPressEvent(QKeyEvent *e); - + protected slots: virtual void dropEvent(QDropEvent *event, QListViewItem *after); void move(QPtrList &item, QPtrList &afterFirst, QPtrList &afterNow); protected: QListViewItem *recursiveAddAfter; - + protected slots: // used when adding directories via KIO::listRecursive void slotResult(KIO::Job *job); @@ -128,17 +130,17 @@ public slots: void headerClicked(int column);void find(); void findIt(Finder *); - + private slots: void setModified(); void saveState(); void configureToolBars(); void newToolBarConfig(); - + protected: void setupActions(); - + void saveToURL(const KURL &); void exportTo(const KURL &); @@ -150,7 +152,7 @@ protected: signals: void hidden(); void shown(); - + private: List *list; KAction *mOpen, *mDelete, *mSave, *mSaveAs, *mOpenpl, *mOpenNew; diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/systray/systray.plugin kdemultimedia-3.1.4.19-4/noatun/modules/systray/systray.plugin --- kdemultimedia-3.1.4/noatun/modules/systray/systray.plugin 2003-09-02 12:47:38.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/systray/systray.plugin 2003-06-25 17:01:53.000000000 +0200 @@ -21,7 +21,6 @@ Name[ko]=젊은 히코리 Name[lt]=Jaunas Hickory Name[lv]=Jaunais Hickorijs Name[mk]=Млад Hickory -Name[pl]=Tacka systemowa Name[sk]=Mladý Hickory Name[sl]=Mladi hikori Name[sv]=Ung valnöt @@ -34,7 +33,6 @@ Comment=A system tray interface Comment[af]='n stelsel laai koppelvlak Comment[ar]=واجهة للوحة النظام Comment[az]=Sistem rəf paneli -Comment[bg]=Интерфейс тип "системен поднос" Comment[bs]=Interfejs za sistemski tray Comment[ca]=Una interfície de la safata del sistema Comment[cs]=Rozhraní systémové části panelu @@ -45,7 +43,7 @@ Comment[eo]=Interfaco por la dokejo Comment[es]=Un interfaz para la bandeja del sistema Comment[et]=Süsteemse doki liides Comment[eu]=Sistemaren azpila interfazea -Comment[fi]=Järjestelmäikkunan rajapinta +Comment[fi]=Jäsjestelmäikkunan rajapinta Comment[fr]=Une interface intégrée dans la boîte à miniatures Comment[he]=ממשק מגש מערכת Comment[hr]=Sučelje za sistemsku ladicu diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop kdemultimedia-3.1.4.19-4/noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop --- kdemultimedia-3.1.4/noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop 2003-07-13 21:29:46.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/winskin/mimetypes/interface/x-winamp-skin.desktop 2003-06-25 17:01:53.000000000 +0200 @@ -6,7 +6,6 @@ Icon=colorscm Patterns=*.wsz;*.WSZ Comment=Compressed Winamp skin Comment[af]=Saamgepersde Winamp vel -Comment[bg]=Комресиран архив с кожа за Winamp Comment[bs]=Komprimirani Winamp skin Comment[ca]=Aparença Winamp comprimida Comment[cs]=Komprimovaný Winamp skin diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/winskin/vis/realFFT.cpp kdemultimedia-3.1.4.19-4/noatun/modules/winskin/vis/realFFT.cpp --- kdemultimedia-3.1.4/noatun/modules/winskin/vis/realFFT.cpp 2003-09-02 03:18:47.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/winskin/vis/realFFT.cpp 2002-05-28 23:01:29.000000000 +0200 @@ -74,10 +74,10 @@ RealFFT::~RealFFT() { /* * Actual FFT routine. Must call InitializeFFT(fftlen) first! - * This routine has another parameter list than the other fft's + * This routine has another paramter list than the other fft's * But because we want a fast fft on pcm data this routine * is better than the other two. - * The other two can be useful for inverse FFT. + * The other two can be usefull for inverse FFT. * The format is an array of floats. (only real parts the img * part does not exists) */ diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/winskin/vis/visQueue.cpp kdemultimedia-3.1.4.19-4/noatun/modules/winskin/vis/visQueue.cpp --- kdemultimedia-3.1.4/noatun/modules/winskin/vis/visQueue.cpp 2003-09-02 03:18:47.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/winskin/vis/visQueue.cpp 2002-05-28 23:01:29.000000000 +0200 @@ -17,6 +17,7 @@ VISQueue::VISQueue(int elements) { this->elements=elements; int i; + visArrayQueue=new (std::vector*[elements]); for(i=0;i; } @@ -29,6 +30,7 @@ VISQueue::~VISQueue() { for(i=0;i* VISQueue::getElement(int i) { diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/winskin/vis/visQueue.h kdemultimedia-3.1.4.19-4/noatun/modules/winskin/vis/visQueue.h --- kdemultimedia-3.1.4/noatun/modules/winskin/vis/visQueue.h 2003-09-02 03:18:47.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/winskin/vis/visQueue.h 2003-02-03 16:33:04.000000000 +0100 @@ -20,7 +20,7 @@ class VISQueue { int elements; - std::vector< std::vector* > visArrayQueue; + std::vector** visArrayQueue; public: VISQueue(int elements); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/winskin/waSkin.cpp kdemultimedia-3.1.4.19-4/noatun/modules/winskin/waSkin.cpp --- kdemultimedia-3.1.4/noatun/modules/winskin/waSkin.cpp 2003-07-13 21:29:46.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/winskin/waSkin.cpp 2003-11-01 22:10:35.000000000 +0100 @@ -103,7 +103,7 @@ WaSkin::WaSkin() : UserInterface() loadSkin(skin); - setCaption(i18n("Noatun")); + setCaption(i18n("Media Player")); setIcon(SmallIcon("noatun")); @@ -135,8 +135,6 @@ WaSkin::WaSkin() : UserInterface() WaSkin::~WaSkin() { - delete waSkinManager; - waSkinManager = 0L; } void WaSkin::loadSkin(QString newSkinDir) @@ -196,7 +194,7 @@ void WaSkin::createButtons() close = new WaButton(_WA_MAPPING_TITLE_CLOSE); close->setPixmapUp(_WA_SKIN_TITLE_CLOSE_NORM); close->setPixmapDown(_WA_SKIN_TITLE_CLOSE_PRES); - connect(close, SIGNAL(clicked()), this, SLOT(doClose())); + connect(close, SIGNAL(clicked()), this, SLOT(closeEvent())); shuffle->setTogglable(true); shuffle->show(); @@ -514,14 +512,10 @@ void WaSkin::shadeEvent() unshade(); } -void WaSkin::doUnload() { +void WaSkin::closeEvent() { unload(); } -void WaSkin::doClose() { - QTimer::singleShot(0, this, SLOT(doUnload())); -} - void WaSkin::dragEnterEvent(QDragEnterEvent * event) { // accept uri drops only diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/modules/winskin/waSkin.h kdemultimedia-3.1.4.19-4/noatun/modules/winskin/waSkin.h --- kdemultimedia-3.1.4/noatun/modules/winskin/waSkin.h 2003-07-13 21:29:46.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/modules/winskin/waSkin.h 2002-05-28 23:01:08.000000000 +0200 @@ -79,8 +79,7 @@ class WaSkin : public QWidget, public Us void menuEvent(); void minimizeEvent(); void shadeEvent(); - void doUnload(); - void doClose(); + void closeEvent(); // balance void balanceSliderPressed(); diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/noatun/noatun.desktop kdemultimedia-3.1.4.19-4/noatun/noatun.desktop --- kdemultimedia-3.1.4/noatun/noatun.desktop 2003-05-07 13:46:52.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/noatun/noatun.desktop 2003-09-30 20:26:07.000000000 +0200 @@ -1,13 +1,13 @@ [Desktop Entry] Encoding=UTF-8 -Name=Noatun +Name=Media Player Name[eo]=Sonorludilo Exec=noatun %i %m -caption "%c" %U Icon=noatun Type=Application DocPath=noatun/index.html MimeType=audio/x-mp3;audio/x-vorbis;application/x-ogg;audio/x-mp2;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;video/x-msvideo;video/quicktime;video/x-flic;audio/basic -GenericName=Multimedia Player +GenericName=Media Player GenericName[af]=Multimedia Speler GenericName[ar]=مشغل الوسائط المتعددة GenericName[bg]=Плеар за мултимедийни файлове diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/xine_artsplugin/tools/thumbnail/Makefile.am kdemultimedia-3.1.4.19-4/xine_artsplugin/tools/thumbnail/Makefile.am --- kdemultimedia-3.1.4/xine_artsplugin/tools/thumbnail/Makefile.am 2003-09-08 20:04:36.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/xine_artsplugin/tools/thumbnail/Makefile.am 2003-02-03 16:33:05.000000000 +0100 @@ -3,7 +3,7 @@ INCLUDES = -I$(kde_includes)/arts $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) +LDFLAGS = $(all_libraries) $(KDE_RPATH) METASOURCES = AUTO kde_module_LTLIBRARIES = videothumbnail.la diff -Np -xCVS -rud -I'$Id' -I'$Version' -I'$Header' -I'$Revision' kdemultimedia-3.1.4/xine_artsplugin/tools/thumbnail/videothumbnail.desktop kdemultimedia-3.1.4.19-4/xine_artsplugin/tools/thumbnail/videothumbnail.desktop --- kdemultimedia-3.1.4/xine_artsplugin/tools/thumbnail/videothumbnail.desktop 2003-07-13 21:29:51.000000000 +0200 +++ kdemultimedia-3.1.4.19-4/xine_artsplugin/tools/thumbnail/videothumbnail.desktop 2003-06-25 17:01:53.000000000 +0200 @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Service Name=Video Files Name[af]=Video Lêers -Name[bg]=Видео файлове Name[bs]=Video datoteke Name[ca]=Fitxers de vídeo Name[cs]=Video soubory