Hello community,
here is the log from the commit of package k3b
checked in at Wed Aug 23 20:50:53 CEST 2006.
--------
--- KDE/k3b/k3b.changes 2006-06-23 11:23:14.000000000 +0200
+++ k3b/k3b.changes 2006-08-23 17:00:32.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Aug 23 16:59:52 CEST 2006 - stbinner@suse.de
+
+- update to 0.12.17:
+ * Fixed saving/loading of the file view configuration.
+ * Improved ffmpeg autoconf check.
+ * Fixed symbolic link handling in data projects
+ * Use UTF-8 encoding to store and load local CDDB entries.
+ * Never use growisofs parameter -dvd-compat with DVD+RW media.
+ * Fixed flac audio encoding for audio project conversion feature.
+
+-------------------------------------------------------------------
Old:
----
k3b-0.12.16.tar.bz2
k3b-i18n-0.12.16.tar.bz2
New:
----
k3b-0.12.17.tar.bz2
k3b-i18n-0.12.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ k3b.spec ++++++
--- /var/tmp/diff_new_pack.lMCpVU/_old 2006-08-23 20:49:49.000000000 +0200
+++ /var/tmp/diff_new_pack.lMCpVU/_new 2006-08-23 20:49:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package k3b (Version 0.12.16)
+# spec file for package k3b (Version 0.12.17)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,7 +24,7 @@
Group: Productivity/Multimedia/CD/Record
Summary: A Universal CD and DVD Burning Application
Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools
-Version: 0.12.16
+Version: 0.12.17
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
@@ -216,6 +216,14 @@
%endif
%changelog -n k3b
+* Wed Aug 23 2006 - stbinner@suse.de
+- update to 0.12.17:
+ * Fixed saving/loading of the file view configuration.
+ * Improved ffmpeg autoconf check.
+ * Fixed symbolic link handling in data projects
+ * Use UTF-8 encoding to store and load local CDDB entries.
+ * Never use growisofs parameter -dvd-compat with DVD+RW media.
+ * Fixed flac audio encoding for audio project conversion feature.
* Fri Jun 23 2006 - stbinner@suse.de
- update to 0.12.16
* Always force 44.1khz in the Lame MP3 encoder plugin.
++++++ k3b-0.12.16.tar.bz2 -> k3b-0.12.17.tar.bz2 ++++++
++++ 1944 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/ChangeLog new/k3b-0.12.17/ChangeLog
--- old/k3b-0.12.16/ChangeLog 2006-06-22 16:45:57.000000000 +0200
+++ new/k3b-0.12.17/ChangeLog 2006-08-23 09:32:30.000000000 +0200
@@ -1,3 +1,13 @@
+0.12.17
+=======
+ * Fixed saving/loading of the file view configuration.
+ * Improved ffmpeg autoconf check.
+ * More FreeBSD Compile fixes (thanks to Heiner Eichmann).
+ * Fixed symbolic link handling in data projects (a bug introduced in 0.12.16)
+ * Use UTF-8 encoding to store and load local CDDB entries.
+ * Never use growisofs parameter -dvd-compat with DVD+RW media.
+ * Fixed flac audio encoding for the audio project conversion feature.
+
0.12.16
=======
* FreeBSD Compile fixes (thanks to Heiner Eichmann).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/config.h.in new/k3b-0.12.17/config.h.in
--- old/k3b-0.12.16/config.h.in 2006-06-22 17:12:01.000000000 +0200
+++ new/k3b-0.12.17/config.h.in 2006-08-23 09:46:04.000000000 +0200
@@ -178,6 +178,9 @@
/* Define to 1 if you have the header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_VFS_H
+
/* have TagLib */
#undef HAVE_TAGLIB
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/configure.files new/k3b-0.12.17/configure.files
--- old/k3b-0.12.16/configure.files 2006-06-22 17:11:50.000000000 +0200
+++ new/k3b-0.12.17/configure.files 2006-08-23 09:45:55.000000000 +0200
@@ -5,4 +5,6 @@
./libk3bdevice/configure.in.in
./plugins/audiooutput/alsa/configure.in.bot
./plugins/audiooutput/alsa/configure.in.in
+./plugins/decoder/ffmpeg/configure.in.bot
+./plugins/decoder/ffmpeg/configure.in.in
configure.in.bot
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/configure.in new/k3b-0.12.17/configure.in
--- old/k3b-0.12.16/configure.in 2006-06-22 17:11:50.000000000 +0200
+++ new/k3b-0.12.17/configure.in 2006-08-23 09:45:55.000000000 +0200
@@ -40,7 +40,7 @@
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(k3b-0.12.16, "3.4.3") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(k3b-0.12.17, "3.4.3") dnl searches for some needed programs
KDE_SET_PREFIX
@@ -449,42 +449,6 @@
AC_SUBST(CAM_LIB)
-dnl --------------- FFMPEG CHECK ---------------------------------
-
-AC_ARG_WITH(
- ffmpeg,
- AS_HELP_STRING(
- [--without-ffmpeg],
- [build without ffmpeg audio decoder support (default=no)]),
- [ac_cv_use_ffmpeg=$withval],
- [ac_cv_use_ffmpeg=yes]
-)
-
-#
-# The ffmpeg decoder plugin needs ffmpeg 0.4.9 or higher
-#
-have_ffmpeg=no
-if test "$ac_cv_use_ffmpeg" = "yes"; then
- AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(
- #include
- #include
-
- int main() {
- AVFormatContext* fc = 0;
- AVPacket* p = 0;
- return av_read_frame( fc, p );
- },
- [have_ffmpeg=yes], [] )
- AC_LANG_RESTORE
- AC_MSG_RESULT($have_ffmpeg)
-fi
-AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes])
-
-dnl --------------- FFMPEG CHECK END ------------------------------
-
dnl ---------- TAGLIB CHECK ----------
@@ -606,6 +570,8 @@
dnl =======================================================
AC_CHECK_FUNCS(stat64)
+AC_CHECK_HEADERS(sys/vfs.h)
+AC_CHECK_HEADERS(sys/statvfs.h)
dnl =======================================================
dnl FILE: ./libk3b/plugin/libsamplerate/configure.in.in
dnl =======================================================
@@ -855,6 +821,61 @@
AM_CONDITIONAL(include_ALSA, [test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes])
dnl --------- ALSA CHECK END ---------------
+dnl =======================================================
+dnl FILE: ./plugins/decoder/ffmpeg/configure.in.in
+dnl =======================================================
+
+dnl --------------- FFMPEG CHECK ---------------------------------
+
+AC_ARG_WITH(
+ ffmpeg,
+ AS_HELP_STRING(
+ [--without-ffmpeg],
+ [build without ffmpeg audio decoder support (default=no)]),
+ [ac_cv_use_ffmpeg=$withval],
+ [ac_cv_use_ffmpeg=yes]
+)
+
+#
+# The ffmpeg decoder plugin needs ffmpeg 0.4.9 or higher
+#
+have_ffmpeg=no
+if test "$ac_cv_use_ffmpeg" = "yes"; then
+ AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(
+ #include
+ #include
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+ av_register_all();
+ return av_read_frame( fc, p );
+ },
+ [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ OLD_LIBS=$LIBS
+ LIBS="-lavformat -lavcodec -lavutil"
+ AC_LINK_IFELSE(
+ #include
+ #include
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+ av_register_all();
+ return av_read_frame( fc, p );
+ },
+ [ffmpeg_links=yes], [ffmpeg_links=no] )
+ AC_LANG_RESTORE
+ LIBS=$OLD_LIBS
+ have_ffmpeg=$ffmpeg_links
+ AC_MSG_RESULT($have_ffmpeg)
+fi
+AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes])
+
+dnl --------------- FFMPEG CHECK END ------------------------------
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ])
@@ -924,6 +945,26 @@
fi
echo ""
+echo "FFMpeg decoder plugin (decodes wma and others):"
+if test x$have_ffmpeg = xyes; then
+ echo " yes"
+else
+ echo " no"
+if test "$ac_cv_use_ffmpeg" = "yes"; then
+ if test "$ffmpeg_compiles" = "yes"; then
+ echo " You are missing the ffmpeg libraries."
+ echo " Make sure ffmpeg has been configured as a"
+ echo " shared library (which is not the default)."
+ else
+ echo " You are missing the ffmpeg headers and libraries"
+ echo " version 0.4.9 or higher."
+ fi
+ echo " The ffmpeg audio decoding plugin (decodes wma and"
+ echo " others) won't be compiled."
+fi
+fi
+
+echo ""
echo ""
echo ""
echo "K3b Configure results:"
@@ -1020,21 +1061,6 @@
echo ""
-echo "FFMpeg decoder plugin (decodes wma and others):"
-if test x$have_ffmpeg = xyes; then
- echo " yes"
-else
- echo " no"
-if test "$ac_cv_use_ffmpeg" = "yes"; then
- echo " You are missing the ffmpeg headers and libraries"
- echo " version 0.4.9 or higher."
- echo " The ffmpeg audio decoding plugin (decodes wma and"
- echo " others) won't be compiled."
-fi
-fi
-
-echo ""
-
if test -n "$RESMGR_LIB"; then
echo "Resmgr support: yes"
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/configure.in.bot new/k3b-0.12.17/configure.in.bot
--- old/k3b-0.12.16/configure.in.bot 2006-06-22 16:45:57.000000000 +0200
+++ new/k3b-0.12.17/configure.in.bot 2006-08-23 09:32:30.000000000 +0200
@@ -94,21 +94,6 @@
echo ""
-echo "FFMpeg decoder plugin (decodes wma and others):"
-if test x$have_ffmpeg = xyes; then
- echo " yes"
-else
- echo " no"
-if test "$ac_cv_use_ffmpeg" = "yes"; then
- echo " You are missing the ffmpeg headers and libraries"
- echo " version 0.4.9 or higher."
- echo " The ffmpeg audio decoding plugin (decodes wma and"
- echo " others) won't be compiled."
-fi
-fi
-
-echo ""
-
if test -n "$RESMGR_LIB"; then
echo "Resmgr support: yes"
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/configure.in.in new/k3b-0.12.17/configure.in.in
--- old/k3b-0.12.16/configure.in.in 2006-06-22 16:45:57.000000000 +0200
+++ new/k3b-0.12.17/configure.in.in 2006-08-23 09:32:30.000000000 +0200
@@ -384,42 +384,6 @@
AC_SUBST(CAM_LIB)
-dnl --------------- FFMPEG CHECK ---------------------------------
-
-AC_ARG_WITH(
- ffmpeg,
- AS_HELP_STRING(
- [--without-ffmpeg],
- [build without ffmpeg audio decoder support (default=no)]),
- [ac_cv_use_ffmpeg=$withval],
- [ac_cv_use_ffmpeg=yes]
-)
-
-#
-# The ffmpeg decoder plugin needs ffmpeg 0.4.9 or higher
-#
-have_ffmpeg=no
-if test "$ac_cv_use_ffmpeg" = "yes"; then
- AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(
- #include
- #include
-
- int main() {
- AVFormatContext* fc = 0;
- AVPacket* p = 0;
- return av_read_frame( fc, p );
- },
- [have_ffmpeg=yes], [] )
- AC_LANG_RESTORE
- AC_MSG_RESULT($have_ffmpeg)
-fi
-AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes])
-
-dnl --------------- FFMPEG CHECK END ------------------------------
-
dnl ---------- TAGLIB CHECK ----------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/k3bsetup/k3bsetup2.desktop new/k3b-0.12.17/k3bsetup/k3bsetup2.desktop
--- old/k3b-0.12.16/k3bsetup/k3bsetup2.desktop 2006-06-22 16:45:34.000000000 +0200
+++ new/k3b-0.12.17/k3bsetup/k3bsetup2.desktop 2006-08-23 09:32:13.000000000 +0200
@@ -12,13 +12,14 @@
Comment[es]=K3bSetup 2 - modifica el permiso para grabar CD/DVD con K3b
Comment[et]=K3b seadistamine - võimalus muuta õigusi CD/DVD kirjutamiseks K3b-ga
Comment[eu]=K3bSetup 2 - aldatu baimenak CD/DVDak K3brekin erretzeko
+Comment[fi]=K3bSetup 2 - aseta K3b:n poltto-oikeudet
Comment[fr]=K3bSetup 2 - Modification des permissions pour la gravure de CD / DVD avec K3b
Comment[he]=K3bSetup 2 - שינוי הרשאות עבור צריבת תקליטורי CD/DVD עם K3b
Comment[hi]=के3बी-सेटअप 2 - के3बी के साथ सीडी/डीवीडी बर्निंग हेतु आज्ञाएँ परिवर्धित करें
Comment[hu]=K3bSetup 2 - jogosultságbeállítás CD/DVD-íráshoz a K3b-ben
Comment[is]=K3bSetup 2 - breyta aðgangsheimildum á CD/DVD skrifun með K3b
Comment[it]=Impostazioni di K3b 2 - modifica i permessi per CD/DVD per scrivere con K3b
-Comment[ja]=K3bSetup 2 - CD/DVD 書き込み用に K3b で許可属性を変更
+Comment[ja]=K3bSetup 2 - K3bでCD/DVDに書き込むための権限を設定
Comment[km]=K3bSetup 2 - កែប្រែសិទ្ធិដើម្បីដុតស៊ីឌី ឬ ឌីវីឌីជាមួយនឹង K3b
Comment[lt]=K3bSetup 2 - pakeiskite leidimus CD/DVD kūrimui su K3b
Comment[mk]=K3bSetup 2 - менување на дозволите за снимање на CD/DVD со К3б
@@ -39,6 +40,7 @@
Comment[ta]= K3bஅமைவு2 - K3b ஐ CD/DVD களோடு எழுதுவதற்காக அனுமதி மாற்றுவதற்காக
Comment[uk]=K3bSetup 2 - зміна прав доступу для запису КД/DVD за допомогою K3b
Comment[zh_CN]=K3b 设置 2 - 修改使用 K3b 烧录 CD/DVD 的权限
+Comment[zh_TW]=K3bSetup 2 - 為 K3b 燒錄 CD/DVD 修改權限
Exec=k3bsetup
Keywords=K3bSetup2,k3bsetup2
Keywords[de]=K3b-Einrichtungsassistent
@@ -61,6 +63,7 @@
Name[nn]=K3b-oppsett
Name[sv]=Ställ in K3b
Name[ta]=K3b அமைவு
+Name[zh_TW]=K3b 設定
Terminal=false
Type=Application
Icon=k3b
@@ -81,6 +84,7 @@
GenericName[es]=Configurar grabación de CD y DVD
GenericName[et]=CD ja DVD kirjutamise seadistamine
GenericName[eu]=CD eta DVDak erretzeko konfigurazioa
+GenericName[fi]=K3b-poltto-ohjelman asetusten määritys
GenericName[fr]=Configuration de la gravure de CD et de DVD
GenericName[hu]=Beállítóprogram CD/DVD-íráshoz
GenericName[is]=Uppsetning á CD & DVD brennslu
@@ -97,7 +101,7 @@
GenericName[pa]=CD & DVD ਲਿਖਣ ਸੈਟਅੱਪ
GenericName[pl]=Konfiguracja nagrywania płyt CD i DVD
GenericName[pt]=Configuração da Gravação de CDs e DVDs
-GenericName[pt_BR]=Configuração da Gravação de CDs e DVDs
+GenericName[pt_BR]=Configuração da Queima de CD & DVD
GenericName[ru]=Настройка записи CD и DVD
GenericName[sl]=Nastavitve za pisanje CD-jev in DVD-jev
GenericName[sr]=Подешавање резања CD-ова и DVD-ова
@@ -107,3 +111,4 @@
GenericName[tr]=CD & DVD Kaydetme Kurulumu
GenericName[uk]=Налаштування запису КД і DVD
GenericName[zh_CN]=CD & DVD 刻录程序设置
+GenericName[zh_TW]=CD & DVD 燒錄設定
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/cddb/k3bcddb.cpp new/k3b-0.12.17/libk3b/cddb/k3bcddb.cpp
--- old/k3b-0.12.16/libk3b/cddb/k3bcddb.cpp 2006-06-22 16:45:52.000000000 +0200
+++ new/k3b-0.12.17/libk3b/cddb/k3bcddb.cpp 2006-08-23 09:32:27.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcddb.cpp 397108 2005-03-13 00:49:01Z trueg $
+ * $Id: k3bcddb.cpp 569327 2006-08-03 14:55:06Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -57,7 +57,7 @@
{
c->setGroup( "Cddb" );
- m_bRemoteCddbQuery = c->readBoolEntry( "use remote cddb", false );
+ m_bRemoteCddbQuery = c->readBoolEntry( "use remote cddb", true );
m_bLocalCddbQuery = c->readBoolEntry( "use local cddb query", false );
// old config <= 0.7.3
@@ -92,13 +92,10 @@
}
-void K3bCddb::query( const K3bToc& toc )
+void K3bCddb::query( const K3bDevice::Toc& toc )
{
m_toc = toc;
- // make sure we have a valid discId
- m_toc.calculateDiscId();
-
if( m_bLocalCddbQuery ) {
m_iCurrentQueriedLocalDir = 0;
QTimer::singleShot( 0, this, SLOT(localQuery()) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/cddb/k3bcddb.h new/k3b-0.12.17/libk3b/cddb/k3bcddb.h
--- old/k3b-0.12.16/libk3b/cddb/k3bcddb.h 2006-06-22 16:45:52.000000000 +0200
+++ new/k3b-0.12.17/libk3b/cddb/k3bcddb.h 2006-08-23 09:32:27.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcddb.h 421129 2005-06-02 09:33:12Z trueg $
+ * $Id: k3bcddb.h 569327 2006-08-03 14:55:06Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -53,7 +53,7 @@
public slots:
/** query a cd and connect to the queryFinished signal */
- void query( const K3bToc& );
+ void query( const K3bDevice::Toc& );
void readConfig( KConfig* c );
void saveEntry( const K3bCddbResultEntry& );
@@ -78,7 +78,7 @@
K3bCddbLocalQuery* m_localQuery;
K3bCddbLocalSubmit* m_localSubmit;
- K3bToc m_toc;
+ K3bDevice::Toc m_toc;
unsigned int m_iCurrentQueriedServer;
unsigned int m_iCurrentQueriedLocalDir;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/cddb/k3bcddblocalsubmit.cpp new/k3b-0.12.17/libk3b/cddb/k3bcddblocalsubmit.cpp
--- old/k3b-0.12.16/libk3b/cddb/k3bcddblocalsubmit.cpp 2006-06-22 16:45:52.000000000 +0200
+++ new/k3b-0.12.17/libk3b/cddb/k3bcddblocalsubmit.cpp 2006-08-23 09:32:27.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcddblocalsubmit.cpp 349270 2004-09-25 15:39:37Z trueg $
+ * $Id: k3bcddblocalsubmit.cpp 569327 2006-08-03 14:55:06Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -83,6 +83,7 @@
else {
kdDebug() << "(K3bCddbLocalSubmit) creating file: " << path << endl;
QTextStream entryStream( &entryFile );
+ entryStream.setEncoding( QTextStream::UnicodeUTF8 );
entryStream << resultEntry().rawData;
entryFile.close();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/cddb/k3bcddbquery.cpp new/k3b-0.12.17/libk3b/cddb/k3bcddbquery.cpp
--- old/k3b-0.12.16/libk3b/cddb/k3bcddbquery.cpp 2006-06-22 16:45:52.000000000 +0200
+++ new/k3b-0.12.17/libk3b/cddb/k3bcddbquery.cpp 2006-08-23 09:32:27.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcddbquery.cpp 457289 2005-09-05 13:05:19Z trueg $
+ * $Id: k3bcddbquery.cpp 569327 2006-08-03 14:55:06Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -47,7 +47,7 @@
}
-void K3bCddbQuery::query( const K3bToc& toc )
+void K3bCddbQuery::query( const K3bDevice::Toc& toc )
{
m_bQueryFinishedEmited = false;
m_toc = toc;
@@ -80,6 +80,8 @@
{
entry.rawData = "";
+ stream.setEncoding( QTextStream::UnicodeUTF8 );
+
// parse data
QString line;
while( !(line = stream.readLine()).isNull() ) {
@@ -231,9 +233,9 @@
QString K3bCddbQuery::queryString() const
{
QString query;
- query.sprintf( "cddb query %08x %d", m_toc.discId(), m_toc.count() );
+ query.sprintf( "cddb query %08x %u", m_toc.discId(), (unsigned int)m_toc.count() );
- for( K3bToc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) {
+ for( K3bDevice::Toc::const_iterator it = m_toc.begin(); it != m_toc.end(); ++it ) {
query.append( QString( " %1" ).arg( (*it).firstSector().lba() ) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/cddb/k3bcddbquery.h new/k3b-0.12.17/libk3b/cddb/k3bcddbquery.h
--- old/k3b-0.12.16/libk3b/cddb/k3bcddbquery.h 2006-06-22 16:45:52.000000000 +0200
+++ new/k3b-0.12.17/libk3b/cddb/k3bcddbquery.h 2006-08-23 09:32:27.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcddbquery.h 421129 2005-06-02 09:33:12Z trueg $
+ * $Id: k3bcddbquery.h 569327 2006-08-03 14:55:06Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -35,7 +35,7 @@
K3bCddbQuery( QObject* parent = 0, const char* name = 0 );
virtual ~K3bCddbQuery();
- void query( const K3bToc& );
+ void query( const K3bDevice::Toc& );
/**
* Use this if the query returned multible matches
@@ -82,7 +82,7 @@
virtual void doMatchQuery() = 0;
protected:
- const K3bToc& toc() const { return m_toc; }
+ const K3bDevice::Toc& toc() const { return m_toc; }
K3bCddbResultHeader& header() { return m_header; }
K3bCddbResultEntry& result() { return m_result; }
void setError( int e ) { m_error = e; }
@@ -103,7 +103,7 @@
QValueList<K3bCddbResultHeader> m_inexactMatches;
private:
- K3bToc m_toc;
+ K3bDevice::Toc m_toc;
K3bCddbResultEntry m_result;
K3bCddbResultHeader m_header;
int m_error;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/configure.in.in new/k3b-0.12.17/libk3b/configure.in.in
--- old/k3b-0.12.16/libk3b/configure.in.in 2006-06-22 16:45:57.000000000 +0200
+++ new/k3b-0.12.17/libk3b/configure.in.in 2006-08-23 09:32:30.000000000 +0200
@@ -1 +1,3 @@
AC_CHECK_FUNCS(stat64)
+AC_CHECK_HEADERS(sys/vfs.h)
+AC_CHECK_HEADERS(sys/statvfs.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/core/k3bcore.h new/k3b-0.12.17/libk3b/core/k3bcore.h
--- old/k3b-0.12.16/libk3b/core/k3bcore.h 2006-06-22 16:45:37.000000000 +0200
+++ new/k3b-0.12.17/libk3b/core/k3bcore.h 2006-08-23 09:32:16.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bcore.h 531404 2006-04-19 09:26:56Z trueg $
+ * $Id: k3bcore.h 555746 2006-06-28 13:36:01Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -23,7 +23,7 @@
-#define LIBK3B_VERSION "0.12.16"
+#define LIBK3B_VERSION "0.12.17"
#define k3bcore K3bCore::k3bCore()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/core/k3bglobals.cpp new/k3b-0.12.17/libk3b/core/k3bglobals.cpp
--- old/k3b-0.12.16/libk3b/core/k3bglobals.cpp 2006-06-22 16:45:37.000000000 +0200
+++ new/k3b-0.12.17/libk3b/core/k3bglobals.cpp 2006-08-23 09:32:16.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bglobals.cpp 543494 2006-05-22 08:32:30Z trueg $
+ * $Id: k3bglobals.cpp 564458 2006-07-20 09:36:44Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -41,16 +41,16 @@
#include
#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include
-#include
-#else
-# ifdef HAVE_SYS_STATVFS_H
-# include
-# endif
-# ifdef HAVE_SYS_STATFS_H
-# include
-# endif
+# include
+# include
#endif
+#ifdef HAVE_SYS_STATVFS_H
+# include
+#endif
+#ifdef HAVE_SYS_STATFS_H
+# include
+#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/projects/datacd/k3bfileitem.cpp new/k3b-0.12.17/libk3b/projects/datacd/k3bfileitem.cpp
--- old/k3b-0.12.16/libk3b/projects/datacd/k3bfileitem.cpp 2006-06-22 16:45:38.000000000 +0200
+++ new/k3b-0.12.17/libk3b/projects/datacd/k3bfileitem.cpp 2006-08-23 09:32:18.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bfileitem.cpp 531385 2006-04-19 08:20:20Z trueg $
+ * $Id: k3bfileitem.cpp 564478 2006-07-20 10:12:13Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -69,7 +69,7 @@
// we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to
// instead the size of the link.
k3b_struct_stat statBuf;
- if( k3b_stat( QFile::encodeName(filePath), &statBuf ) ) {
+ if( k3b_lstat( QFile::encodeName(filePath), &statBuf ) ) {
m_size = K3b::filesize( filePath );
kdError() << "(KFileItem) lstat failed: " << strerror(errno) << endl;
m_id.inode = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3b/projects/datadvd/k3bdvdjob.cpp new/k3b-0.12.17/libk3b/projects/datadvd/k3bdvdjob.cpp
--- old/k3b-0.12.16/libk3b/projects/datadvd/k3bdvdjob.cpp 2006-06-22 16:45:39.000000000 +0200
+++ new/k3b-0.12.17/libk3b/projects/datadvd/k3bdvdjob.cpp 2006-08-23 09:32:18.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bdvdjob.cpp 528555 2006-04-11 12:17:49Z trueg $
+ * $Id: k3bdvdjob.cpp 569328 2006-08-03 14:55:39Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -554,7 +554,7 @@
//
// we need to handle DVD+RW and DVD-RW overwrite media differently since remainingSize() is not valid
// in both cases
- // Since one never closes a DVD+RW we only differ between CONTINUE and NONE
+ // Since one never closes a DVD+RW we only differ between CONTINUE and START
//
// try to check the filesystem size
@@ -563,7 +563,7 @@
d->usedMultiSessionMode = K3bDataDoc::CONTINUE;
}
else {
- d->usedMultiSessionMode = K3bDataDoc::NONE;
+ d->usedMultiSessionMode = K3bDataDoc::START;
}
}
else if( info.appendable() ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3bdevice/k3bdevice.cpp new/k3b-0.12.17/libk3bdevice/k3bdevice.cpp
--- old/k3b-0.12.16/libk3bdevice/k3bdevice.cpp 2006-06-22 16:45:09.000000000 +0200
+++ new/k3b-0.12.17/libk3bdevice/k3bdevice.cpp 2006-08-23 09:31:48.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bdevice.cpp 553928 2006-06-22 14:30:38Z trueg $
+ * $Id: k3bdevice.cpp 575048 2006-08-20 17:33:25Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -1786,13 +1786,13 @@
}
switch( dInf->border ) {
- case 0x00:
+ case 0:
inf.m_lastSessionState = STATE_EMPTY;
break;
- case 0x01:
+ case 1:
inf.m_lastSessionState = STATE_INCOMPLETE;
break;
- case 0x11:
+ case 2:
inf.m_lastSessionState = STATE_COMPLETE;
break;
default:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/libk3bdevice/k3bdevice_mmc.cpp new/k3b-0.12.17/libk3bdevice/k3bdevice_mmc.cpp
--- old/k3b-0.12.16/libk3bdevice/k3bdevice_mmc.cpp 2006-06-22 16:45:09.000000000 +0200
+++ new/k3b-0.12.17/libk3bdevice/k3bdevice_mmc.cpp 2006-08-23 09:31:48.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bdevice_mmc.cpp 553928 2006-06-22 14:30:38Z trueg $
+ * $Id: k3bdevice_mmc.cpp 575048 2006-08-20 17:33:25Z trueg $
* Copyright (C) 2004 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -57,7 +57,7 @@
// with these buggy drives.
// We cannot use this as default since many firmwares fail with a too high data length.
//
- if( dataLen == 8 ) {
+ if( dataLen <= 8 ) {
cmd[7] = 2048>>8;
cmd[8] = 2048;
if( cmd.transport( TR_DIR_READ, header, 2048 ) == 0 )
@@ -268,41 +268,47 @@
return false;
}
- cmd[8] = 4; // first we read the header
- if( cmd.transport( TR_DIR_READ, header, 4 ) == 0 ) {
- // again with real length
+ // first we read the header
+ dataLen = 4;
+ cmd[8] = 4;
+ if( cmd.transport( TR_DIR_READ, header, 4 ) == 0 )
dataLen = from2Byte( header ) + 2;
-
- //
- // Some buggy firmwares do not return the size of the available data
- // but the returned data. So we use a high power of 2 to be on the safe side
- // with these buggy drives.
- // We cannot use this as default since many firmwares fail with a too high data length.
- //
- if( dataLen == 4 ) {
- cmd[7] = 2048>>8;
- cmd[8] = 2048;
- if( cmd.transport( TR_DIR_READ, header, 2048 ) == 0 )
- dataLen = from2Byte( header ) + 2;
- }
-
- *data = new unsigned char[dataLen];
- ::memset( *data, 0, dataLen );
-
- cmd[7] = dataLen>>8;
- cmd[8] = dataLen;
- if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) {
- return true;
- }
- else {
- kdDebug() << "(K3bDevice::Device) " << blockDeviceName() << ": READ TRACK INFORMATION with real length "
- << dataLen << " failed." << endl;
- delete [] *data;
- }
- }
else
kdDebug() << "(K3bDevice::Device) " << blockDeviceName() << ": READ TRACK INFORMATION length det failed." << endl;
+ //
+ // Some buggy firmwares do not return the size of the available data
+ // but the returned data.
+ // So we try to determine the correct size based on the medium type
+ // DVD+R: 40 (MMC4)
+ // DVD-DL: 48 (MMC5)
+ // CD: 36 (MMC2)
+ //
+ if( dataLen <= 4 ) {
+ int m = dvdMediaType();
+ if( m & (MEDIA_DVD_R_DL|MEDIA_DVD_R_DL_SEQ|MEDIA_DVD_R_DL_JUMP) )
+ dataLen = 48;
+ else if( m & (MEDIA_DVD_PLUS_R|MEDIA_DVD_PLUS_R_DL) )
+ dataLen = 40;
+ else
+ dataLen = 36;
+ }
+
+ // again with real length
+ *data = new unsigned char[dataLen];
+ ::memset( *data, 0, dataLen );
+
+ cmd[7] = dataLen>>8;
+ cmd[8] = dataLen;
+ if( cmd.transport( TR_DIR_READ, *data, dataLen ) == 0 ) {
+ return true;
+ }
+ else {
+ kdDebug() << "(K3bDevice::Device) " << blockDeviceName() << ": READ TRACK INFORMATION with real length "
+ << dataLen << " failed." << endl;
+ delete [] *data;
+ }
+
return false;
}
@@ -480,7 +486,7 @@
// with these buggy drives.
// We cannot use this as default since many firmwares fail with a too high data length.
//
- if( dataLen == 4 ) {
+ if( dataLen <= 4 ) {
cmd[7] = 2048>>8;
cmd[8] = 2048;
if( cmd.transport( TR_DIR_READ, header, 2048 ) == 0 )
@@ -531,7 +537,7 @@
// with these buggy drives.
// We cannot use this as default since many firmwares fail with a too high data length.
//
- if( dataLen == 2 ) {
+ if( dataLen <= 2 ) {
cmd[7] = 2048>>8;
cmd[8] = 2048;
if( cmd.transport( TR_DIR_READ, header, 2048 ) == 0 )
@@ -578,7 +584,7 @@
// with these buggy drives.
// We cannot use this as default since many firmwares fail with a too high data length.
//
- if( dataLen == 8 ) {
+ if( dataLen <= 8 ) {
cmd[8] = 2048>>8;
cmd[9] = 2048;
if( cmd.transport( TR_DIR_READ, header, 2048 ) == 0 )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/plugins/decoder/ffmpeg/configure.in.bot new/k3b-0.12.17/plugins/decoder/ffmpeg/configure.in.bot
--- old/k3b-0.12.16/plugins/decoder/ffmpeg/configure.in.bot 1970-01-01 01:00:00.000000000 +0100
+++ new/k3b-0.12.17/plugins/decoder/ffmpeg/configure.in.bot 2006-08-23 09:31:46.000000000 +0200
@@ -0,0 +1,20 @@
+echo "FFMpeg decoder plugin (decodes wma and others):"
+if test x$have_ffmpeg = xyes; then
+ echo " yes"
+else
+ echo " no"
+if test "$ac_cv_use_ffmpeg" = "yes"; then
+ if test "$ffmpeg_compiles" = "yes"; then
+ echo " You are missing the ffmpeg libraries."
+ echo " Make sure ffmpeg has been configured as a"
+ echo " shared library (which is not the default)."
+ else
+ echo " You are missing the ffmpeg headers and libraries"
+ echo " version 0.4.9 or higher."
+ fi
+ echo " The ffmpeg audio decoding plugin (decodes wma and"
+ echo " others) won't be compiled."
+fi
+fi
+
+echo ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/plugins/decoder/ffmpeg/configure.in.in new/k3b-0.12.17/plugins/decoder/ffmpeg/configure.in.in
--- old/k3b-0.12.16/plugins/decoder/ffmpeg/configure.in.in 1970-01-01 01:00:00.000000000 +0100
+++ new/k3b-0.12.17/plugins/decoder/ffmpeg/configure.in.in 2006-08-23 09:31:46.000000000 +0200
@@ -0,0 +1,51 @@
+dnl --------------- FFMPEG CHECK ---------------------------------
+
+AC_ARG_WITH(
+ ffmpeg,
+ AS_HELP_STRING(
+ [--without-ffmpeg],
+ [build without ffmpeg audio decoder support (default=no)]),
+ [ac_cv_use_ffmpeg=$withval],
+ [ac_cv_use_ffmpeg=yes]
+)
+
+#
+# The ffmpeg decoder plugin needs ffmpeg 0.4.9 or higher
+#
+have_ffmpeg=no
+if test "$ac_cv_use_ffmpeg" = "yes"; then
+ AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_COMPILE_IFELSE(
+ #include
+ #include
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+ av_register_all();
+ return av_read_frame( fc, p );
+ },
+ [ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ OLD_LIBS=$LIBS
+ LIBS="-lavformat -lavcodec -lavutil"
+ AC_LINK_IFELSE(
+ #include
+ #include
+
+ int main() {
+ AVFormatContext* fc = 0;
+ AVPacket* p = 0;
+ av_register_all();
+ return av_read_frame( fc, p );
+ },
+ [ffmpeg_links=yes], [ffmpeg_links=no] )
+ AC_LANG_RESTORE
+ LIBS=$OLD_LIBS
+ have_ffmpeg=$ffmpeg_links
+ AC_MSG_RESULT($have_ffmpeg)
+fi
+AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes])
+
+dnl --------------- FFMPEG CHECK END ------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/eventsrc new/k3b-0.12.17/src/eventsrc
--- old/k3b-0.12.16/src/eventsrc 2006-06-22 16:45:33.000000000 +0200
+++ new/k3b-0.12.17/src/eventsrc 2006-08-23 09:32:12.000000000 +0200
@@ -19,6 +19,7 @@
Name[es]=Proceso con éxito
Name[et]=Tegevus oli edukas
Name[eu]=Prozesua ongi egin da
+Name[fi]=Suoritettu
Name[fr]=Processus réussi
Name[ga]=D'éirigh leis an bpróiseas
Name[he]=תהליך מוצלח
@@ -48,6 +49,7 @@
Name[tr]=İşlem başarılı
Name[uk]=Процес успішний
Name[zh_CN]=处理成功
+Name[zh_TW]=處理成功
Comment=Process successfully finished
Comment[af]=Proses het suksesvol klaar gemaak
Comment[bg]=Обработката приключи успешно
@@ -61,6 +63,7 @@
Comment[es]=Proceso terminado con éxito
Comment[et]=Tegevus lõppes edukalt
Comment[eu]=Prozesua ongi burutu da
+Comment[fi]=Työ on suoritettu
Comment[fr]=Processus terminé avec succès
Comment[he]=התהליך הסתיים בהצלחה
Comment[hi]=प्रक्रिया सफलतापूर्वक पूर्ण
@@ -89,6 +92,7 @@
Comment[tr]=İşlem başarıyla sonuçlandı
Comment[uk]=Процес успішно завершився
Comment[zh_CN]=处理成功完成
+Comment[zh_TW]=成功完成處理
default_sound=k3b_success1.wav
default_presentation=1
# None = 0, Sound = 1, Messagebox = 2, Logfile = 4, Stderr = 8, PassivePopup = 16, Execute = 32
@@ -107,6 +111,7 @@
Name[es]=Proceso con error
Name[et]=Tegevuse viga
Name[eu]=Prozesu errorea
+Name[fi]=Virhe
Name[fr]=Erreur du processus
Name[he]=שגיאת תהליך
Name[hi]=प्रक्रिया त्रुटि
@@ -135,6 +140,7 @@
Name[tr]=İşlemde hata var
Name[uk]=Помилка процесу
Name[zh_CN]=处理错误
+Name[zh_TW]=處理發生錯誤
Comment=Process finished with errors
Comment[af]=Die proses het met foute klaar gemaak
Comment[bg]=Обработката приключи с грешки
@@ -148,6 +154,7 @@
Comment[es]=Proceso terminado con errores
Comment[et]=Tegevus lõppes vigadega
Comment[eu]=Prozesua erroreekin bukatu da
+Comment[fi]=Työtä suoritettaessa tapahtui virheitä
Comment[fr]=Processus terminé avec des erreurs
Comment[he]=התהליך הסתיים עם שגיאות
Comment[hi]=प्रक्रिया त्रुटि के साथ पूर्ण
@@ -176,6 +183,7 @@
Comment[tr]=İşlem hatayla sonuçlandı
Comment[uk]=Процес завершився з помилками
Comment[zh_CN]=处理完成,有错误
+Comment[zh_TW]=完成處理,但發生錯誤
default_sound=k3b_error1.wav
default_presentation=1
@@ -194,6 +202,7 @@
Name[es]=Esperando el medio
Name[et]=Andmekandja ootamine
Name[eu]=Euskarriaren zain
+Name[fi]=Odotetaan levyä
Name[fr]=En attente du média
Name[he]=מצפה למדיה
Name[hi]=साधन हेतु प्रतीक्षारत
@@ -222,6 +231,7 @@
Name[tr]=Ortam bekleniyor
Name[uk]=Очікування носія
Name[zh_CN]=等待存储介质
+Name[zh_TW]=等待插入媒體
Comment=The user needs to insert a medium
Comment[af]=Die gebruiker moet 'n medium insit
Comment[bg]=Потребителят трябва да постави медия в устройството
@@ -235,6 +245,7 @@
Comment[es]=El usuario necesita insertar un medio
Comment[et]=Kasutajal tuleb andmekandja sisse panna
Comment[eu]=Erabiltzaileak euskarria sartu behar du
+Comment[fi]=Odotetaan käyttäjän syöttävän levyn
Comment[fr]=L'utilisateur doit insérer un média
Comment[he]=המשתמש חייב להכניס מדיית צריבה
Comment[hi]=उपयोगकर्ता को आवश्यक होगा कि साधन प्रविष्ट करे
@@ -262,5 +273,6 @@
Comment[tr]=Kullanıcının bir ortam takması gerekiyor
Comment[uk]=Користувач мусить вставити носій
Comment[zh_CN]=用户需要插入存储介质
+Comment[zh_TW]=使用者需要插入媒體
default_sound=k3b_wait_media1.wav
default_presentation=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/k3b.desktop new/k3b-0.12.17/src/k3b.desktop
--- old/k3b-0.12.16/src/k3b.desktop 2006-06-22 16:45:33.000000000 +0200
+++ new/k3b-0.12.17/src/k3b.desktop 2006-08-23 09:32:12.000000000 +0200
@@ -5,7 +5,7 @@
Icon=k3b
DocPath=k3b/index.html
GenericName=CD & DVD Burning
-GenericName[af]=CD & DVD Skryf
+GenericName[af]=CD & DVD Skrywer
GenericName[bg]=Запис на CD и DVD
GenericName[bn]=সিডি এবং ডিভিডি লিখন
GenericName[br]=Skrivañ CD ha DVD
@@ -18,6 +18,7 @@
GenericName[es]=Grabación de CD y DVD
GenericName[et]=CD ja DVD kirjutamine
GenericName[eu]=CD eta DVDak erretzeko
+GenericName[fi]=Poltto-ohjelma
GenericName[fr]=Gravure de CD et DVD
GenericName[he]=צריבת תקליטורי CD & DVD
GenericName[hi]=सीडी & डीवीडी बर्निंग
@@ -45,6 +46,7 @@
GenericName[tr]=CD & DVD Kaydetme
GenericName[uk]=Запис КД і DVD
GenericName[zh_CN]=CD & DVD 烧录程序
+GenericName[zh_TW]=CD & DVD 燒錄
Comment=CD writing program
Comment[af]=CD skryf program
Comment[bg]=Програма за запис на CD
@@ -59,6 +61,7 @@
Comment[es]=Programa de escritura de CDs
Comment[et]=CD kirjutamise rakendus
Comment[eu]=CDak idazteko programa
+Comment[fi]=Poltto-ohjelma
Comment[fr]=Programme de gravure de CD
Comment[he]=תוכנית צריבת תקליטורים
Comment[hi]=सीडी लिखने का प्रोग्राम
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/k3bdiroperator.cpp new/k3b-0.12.17/src/k3bdiroperator.cpp
--- old/k3b-0.12.16/src/k3bdiroperator.cpp 2006-06-22 16:45:33.000000000 +0200
+++ new/k3b-0.12.17/src/k3bdiroperator.cpp 2006-08-23 09:32:12.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bdiroperator.cpp 442567 2005-08-03 07:42:59Z trueg $
+ * $Id: k3bdiroperator.cpp 555746 2006-06-28 13:36:01Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -65,6 +65,7 @@
cfg->setGroup( group );
KDirOperator::readConfig( cfg, group );
+ setView( KFile::Default );
//
// There seems to be a bug in the KDELibs which makes setURL crash on
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/konqi/k3b_create_audio_cd.desktop new/k3b-0.12.17/src/konqi/k3b_create_audio_cd.desktop
--- old/k3b-0.12.16/src/konqi/k3b_create_audio_cd.desktop 2006-06-22 16:45:23.000000000 +0200
+++ new/k3b-0.12.17/src/konqi/k3b_create_audio_cd.desktop 2006-08-23 09:32:02.000000000 +0200
@@ -19,6 +19,7 @@
Name[es]=Crear CD de audio con K3b...
Name[et]=Kirjuta audio-CD K3b abil...
Name[eu]=Sortu audio cdak K3b-rekin...
+Name[fi]=Luo musiikki-cd K3b:llä...
Name[fr]=Créer un CD audio avec K3b...
Name[he]=צור תקליטור שמע בעזרת K3b...
Name[hi]=के3बी के साथ ऑडियो सीडी बनाए...
@@ -46,4 +47,5 @@
Name[tr]=K3b ile Ses CD'si oluştur...
Name[uk]=Створити аудіо-КД за допомогою K3b...
Name[zh_CN]=用 K3b 创建音频 CD...
+Name[zh_TW]=使用 K3b 建立音樂 CD...
Icon=k3b
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/konqi/k3b_create_data_cd.desktop new/k3b-0.12.17/src/konqi/k3b_create_data_cd.desktop
--- old/k3b-0.12.16/src/konqi/k3b_create_data_cd.desktop 2006-06-22 16:45:23.000000000 +0200
+++ new/k3b-0.12.17/src/konqi/k3b_create_data_cd.desktop 2006-08-23 09:32:02.000000000 +0200
@@ -20,6 +20,7 @@
Name[es]=Crear CD de datos con K3b...
Name[et]=Kirjuta andme-CD K3b abil...
Name[eu]=Sortu datu CDak K3b-rekin...
+Name[fi]=Luo data-cd K3b:llä...
Name[fr]=Créer un CD de données avec K3b...
Name[he]=צור תקליטורי מידע CD בעזרת K3b...
Name[hi]=के3बी के साथ डाटा सीडी बनाए...
@@ -47,4 +48,5 @@
Name[tr]=K3b ile Veri CD'si oluştur...
Name[uk]=Створити КД з даними за допомогою K3b...
Name[zh_CN]=用 K3b 创建数据 CD...
+Name[zh_TW]=使用 K3b 建立資料 CD...
Icon=k3b
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/konqi/k3b_create_video_cd.desktop new/k3b-0.12.17/src/konqi/k3b_create_video_cd.desktop
--- old/k3b-0.12.16/src/konqi/k3b_create_video_cd.desktop 2006-06-22 16:45:23.000000000 +0200
+++ new/k3b-0.12.17/src/konqi/k3b_create_video_cd.desktop 2006-08-23 09:32:02.000000000 +0200
@@ -19,6 +19,7 @@
Name[es]=Crear Video CD con K3b...
Name[et]=Kirjuta video-CD K3b abil...
Name[eu]=Sortu Bideo CDak K3b-rekin...
+Name[fi]=Luo videocd K3b:llä...
Name[fr]=Créer un CD vidéo avec K3b...
Name[he]=צור תקליטורי וידאו VCD בעזרת K3b...
Name[hi]=के3बी के साथ वीडियो सीडी बनाए...
@@ -46,4 +47,5 @@
Name[tr]=K3b ile Video CD'si oluştur...
Name[uk]=Створити відео-КД за допомогою K3b...
Name[zh_CN]=用 K3b 创建视频 CD...
+Name[zh_TW]=使用 K3b 建立 VCD...
Icon=k3b
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/konqi/k3b_write_bin_image.desktop new/k3b-0.12.17/src/konqi/k3b_write_bin_image.desktop
--- old/k3b-0.12.16/src/konqi/k3b_write_bin_image.desktop 2006-06-22 16:45:23.000000000 +0200
+++ new/k3b-0.12.17/src/konqi/k3b_write_bin_image.desktop 2006-08-23 09:32:02.000000000 +0200
@@ -19,6 +19,7 @@
Name[es]=Escribir imagen de CD con K3b...
Name[et]=Kirjuta tõmmis K3b abil plaadile...
Name[eu]=Idatzi CD irudiak K3b-rekin...
+Name[fi]=Polta levykuva cd-levylle K3b:llä...
Name[fr]=Graver une image CD avec K3b...
Name[he]=כתוב תבנית CD בעזרת K3b...
Name[hi]=के3बी के साथ सीडी इमेज लिखें...
@@ -46,4 +47,5 @@
Name[tr]=K3b ile CD Kalıbı yazdır...
Name[uk]=Записати штамп КД за допомогою K3b...
Name[zh_CN]=用 K3b 刻录 CD 映像...
+Name[zh_TW]=使用 K3b 燒錄 CD 影像...
Icon=k3b
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/konqi/k3b_write_iso_image.desktop new/k3b-0.12.17/src/konqi/k3b_write_iso_image.desktop
--- old/k3b-0.12.16/src/konqi/k3b_write_iso_image.desktop 2006-06-22 16:45:23.000000000 +0200
+++ new/k3b-0.12.17/src/konqi/k3b_write_iso_image.desktop 2006-08-23 09:32:02.000000000 +0200
@@ -19,6 +19,7 @@
Name[es]=Escribir imagen de CD con K3b...
Name[et]=Kirjuta tõmmis K3b abil plaadile...
Name[eu]=Idatzi CD irudiak K3b-rekin...
+Name[fi]=Polta levykuva cd-levylle K3b:llä...
Name[fr]=Graver une image CD avec K3b...
Name[he]=כתוב תבנית CD בעזרת K3b...
Name[hi]=के3बी के साथ सीडी इमेज लिखें...
@@ -46,4 +47,5 @@
Name[tr]=K3b ile CD Kalıbı yazdır...
Name[uk]=Записати штамп КД за допомогою K3b...
Name[zh_CN]=用 K3b 刻录 CD 映像...
+Name[zh_TW]=使用 K3b 燒錄 CD 影像...
Icon=k3b
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/main.cpp new/k3b-0.12.17/src/main.cpp
--- old/k3b-0.12.16/src/main.cpp 2006-06-22 17:11:48.000000000 +0200
+++ new/k3b-0.12.17/src/main.cpp 2006-08-23 09:45:54.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: main.cpp 531404 2006-04-19 09:26:56Z trueg $
+ * $Id: main.cpp 555746 2006-06-28 13:36:01Z trueg $
*
* This file is part of the K3b project.
* Copyright (C) 1998-2006 Sebastian Trueg
@@ -39,7 +39,7 @@
#include
-static const char* appVersion = "0.12.16";
+static const char* appVersion = "0.12.17";
static const char* description = I18N_NOOP("A CD and DVD burning application");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/mimetypes/x-k3b.desktop new/k3b-0.12.17/src/mimetypes/x-k3b.desktop
--- old/k3b-0.12.16/src/mimetypes/x-k3b.desktop 2006-06-22 16:45:12.000000000 +0200
+++ new/k3b-0.12.17/src/mimetypes/x-k3b.desktop 2006-08-23 09:31:52.000000000 +0200
@@ -16,6 +16,7 @@
Comment[es]=Proyecto de K3b
Comment[et]=K3b Projekt
Comment[eu]=K3b proiektua
+Comment[fi]=K3b-projekti
Comment[fr]=Projet K3b
Comment[he]=פרויקט K3b
Comment[hi]=के3बी परियोजना
@@ -43,6 +44,7 @@
Comment[tr]=K3b Projesi
Comment[uk]=Проект K3b
Comment[zh_CN]=K3b 方案
+Comment[zh_TW]=K3b 專案
Icon=k3b
Type=MimeType
Patterns=*.k3b;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/projects/k3bdatavolumedescwidget.cpp new/k3b-0.12.17/src/projects/k3bdatavolumedescwidget.cpp
--- old/k3b-0.12.16/src/projects/k3bdatavolumedescwidget.cpp 2006-06-22 16:45:29.000000000 +0200
+++ new/k3b-0.12.17/src/projects/k3bdatavolumedescwidget.cpp 2006-08-23 09:32:08.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3bdatavolumedescwidget.cpp 392137 2005-02-22 08:01:29Z trueg $
+ * $Id: k3bdatavolumedescwidget.cpp 572907 2006-08-14 10:27:41Z trueg $
* Copyright (C) 2003 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -70,7 +70,7 @@
void K3bDataVolumeDescWidget::save( K3bIsoOptions& o )
{
o.setVolumeID( m_editVolumeName->text() );
- o.setVolumeSetId( QString::null /*m_editVolumeSetName->text()*/ );
+ o.setVolumeSetId( m_editVolumeSetName->text() );
o.setVolumeSetSize( 1/*m_spinVolumeSetSize->value() */);
o.setVolumeSetNumber( 1/*m_spinVolumeSetNumber->value() */);
o.setPublisher( m_editPublisher->text() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/k3b-0.12.16/src/rip/k3baudioprojectconvertingthread.cpp new/k3b-0.12.17/src/rip/k3baudioprojectconvertingthread.cpp
--- old/k3b-0.12.16/src/rip/k3baudioprojectconvertingthread.cpp 2006-06-22 16:45:31.000000000 +0200
+++ new/k3b-0.12.17/src/rip/k3baudioprojectconvertingthread.cpp 2006-08-23 09:32:11.000000000 +0200
@@ -1,6 +1,6 @@
/*
*
- * $Id: k3baudioprojectconvertingthread.cpp 457135 2005-09-04 20:33:59Z trueg $
+ * $Id: k3baudioprojectconvertingthread.cpp 572907 2006-08-14 10:27:41Z trueg $
* Copyright (C) 2005 Sebastian Trueg
*
* This file is part of the K3b project.
@@ -154,10 +154,12 @@
++i;
}
- if( d->encoder )
- d->encoder->closeFile();
- else
- d->waveFileWriter->close();
+ if( m_singleFile ) {
+ if( d->encoder )
+ d->encoder->closeFile();
+ else
+ d->waveFileWriter->close();
+ }
if( !d->canceled && m_writePlaylist ) {
success = success && writePlaylist();
@@ -262,6 +264,13 @@
emitPercent( 100*d->overallBytesRead/d->overallBytesToRead );
}
+ if( !m_singleFile ) {
+ if( d->encoder )
+ d->encoder->closeFile();
+ else
+ d->waveFileWriter->close();
+ }
+
return ( readLength == 0 );
}
++++++ k3b-i18n-0.12.16.tar.bz2 -> k3b-i18n-0.12.17.tar.bz2 ++++++
++++ 76519 lines of diff (skipped)
++++++ sound.diff ++++++
--- /var/tmp/diff_new_pack.lMCpVU/_old 2006-08-23 20:50:08.000000000 +0200
+++ /var/tmp/diff_new_pack.lMCpVU/_new 2006-08-23 20:50:08.000000000 +0200
@@ -1,9 +1,9 @@
---- src/eventsrc
-+++ src/eventsrc 2005/08/19 07:30:30
-@@ -66,7 +66,7 @@
- Comment[tr]=İşlem başarıyla sonuçlandı
+--- src/eventsrc 2006/08/23 14:54:52 1.1
++++ src/eventsrc 2006/08/23 14:56:55
+@@ -93,7 +93,7 @@
Comment[uk]=Процес успішно завершився
Comment[zh_CN]=处理成功完成
+ Comment[zh_TW]=成功完成處理
-default_sound=k3b_success1.wav
+default_sound=KDE_Drum_Break.ogg
default_presentation=1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org