Hello community,
here is the log from the commit of package kdemultimedia4 for openSUSE:Factory
checked in at Fri Jan 8 16:28:16 CET 2010.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2009-12-18 13:47:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2010-01-06 21:49:53.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 6 19:07:06 CET 2010 - dmueller@suse.de
+
+- update to 4.3.90
+ * see http://www.kde.org/announcements/announce-4.4-rc1.php for details
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdemultimedia-4.3.85.tar.bz2
New:
----
kdemultimedia-4.3.90.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.p939Vb/_old 2010-01-08 16:28:08.000000000 +0100
+++ /var/tmp/diff_new_pack.p939Vb/_new 2010-01-08 16:28:08.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package kdemultimedia4 (Version 4.3.85)
+# spec file for package kdemultimedia4 (Version 4.3.90)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 4.3.85
+Version: 4.3.90
Release: 1
Source0: kdemultimedia-%version.tar.bz2
Patch0: 4_4_BRANCH.diff
++++++ kdemultimedia-4.3.85.tar.bz2 -> kdemultimedia-4.3.90.tar.bz2 ++++++
Files old/kdemultimedia-4.3.85/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.3.90/doc/dragonplayer/index.cache.bz2 differ
Files old/kdemultimedia-4.3.85/doc/juk/index.cache.bz2 and new/kdemultimedia-4.3.90/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-4.3.85/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.3.90/doc/kioslave/audiocd/index.cache.bz2 differ
Files old/kdemultimedia-4.3.85/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.3.90/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-4.3.85/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.3.90/doc/kscd/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer-opendvd.desktop new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer-opendvd.desktop
--- old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer-opendvd.desktop 2009-12-14 11:53:44.000000000 +0100
+++ new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer-opendvd.desktop 2010-01-06 18:01:10.000000000 +0100
@@ -6,6 +6,7 @@
[Desktop Action open]
Name=Open with Video Player (Dragon Player)
Name[ar]=افتح باستخدام مشغل الفيديو (مشغل دارجن)
+Name[ast]=Abrir col reproductor de vídeu (Dragon Player)
Name[bg]=Отваряне с видео плеър (Dragon)
Name[ca]=Obre amb el reproductor de vídeo (Dragon Player)
Name[cs]=Otevřít ve video přehrávači (Dragon)
@@ -43,6 +44,8 @@
Name[sk]=Otvoriť pomocou prehrávača videa (Dragon)
Name[sl]=Odpri s predvajalnikom videa (Dragon Player)
Name[sr]=Отвори Змајевим плејером
+Name[sr@ijekavian]=Отвори Змајевим плејером
+Name[sr@ijekavianlatin]=Otvori Zmajevim plejerom
Name[sr@latin]=Otvori Zmajevim plejerom
Name[sv]=Öppna med videospelare (Dragon)
Name[th]=เปิดกับโปรแกรมเล่นวิดีโอ (Dragon Player)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer.desktop new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer.desktop
--- old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer.desktop 2009-11-23 16:30:23.000000000 +0100
+++ new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer.desktop 2010-01-06 18:01:10.000000000 +0100
@@ -3,6 +3,7 @@
Version=1.0
Name=Dragon Player
Name[ar]=مشغل دراجن
+Name[ast]=Dragon Player
Name[bg]=Програма за видео Dragon
Name[ca]=Dragon Player
Name[cs]=Přehrávač Dragon
@@ -40,6 +41,8 @@
Name[sk]=Prehrávač Dragon
Name[sl]=Dragon Player
Name[sr]=Змајев плејер
+Name[sr@ijekavian]=Змајев плејер
+Name[sr@ijekavianlatin]=Zmajev plejer
Name[sr@latin]=Zmajev plejer
Name[sv]=Dragon videospelare
Name[th]=โปรแกรมเล่นสื่อ Dragon Player
@@ -51,6 +54,7 @@
Name[zh_TW]=神龍播放器
GenericName=Video Player
GenericName[ar]=مشغل فيديو
+GenericName[ast]=Reproductor de vídeu
GenericName[bg]=Програма за възпроизвеждане на видео
GenericName[ca]=Reproductor de vídeo
GenericName[cs]=Přehrávač videa
@@ -88,6 +92,8 @@
GenericName[sk]=Prehrávač videa
GenericName[sl]=Predvajalnik videov
GenericName[sr]=Видео плејер
+GenericName[sr@ijekavian]=Видео плејер
+GenericName[sr@ijekavianlatin]=Video plejer
GenericName[sr@latin]=Video plejer
GenericName[sv]=Videospelare
GenericName[th]=โปรแกรมเล่นวิดีโอ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer_part.desktop new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer_part.desktop
--- old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer_part.desktop 2009-11-23 16:30:23.000000000 +0100
+++ new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer_part.desktop 2010-01-06 18:01:10.000000000 +0100
@@ -3,6 +3,7 @@
Icon=dragonplayer
Name=Dragon Player Part
Name[ar]=جزء مشغل دراجن
+Name[ast]=Parte de Dragon Player
Name[bg]=Dragon (част)
Name[ca]=Part del Dragon Player
Name[cs]=Komponenta přehrávače Dragon
@@ -39,6 +40,8 @@
Name[sk]=Komponent prehrávača Dragon
Name[sl]=Komponeneta Dragon Player
Name[sr]=Змајев плејер део
+Name[sr@ijekavian]=Змајев плејер дио
+Name[sr@ijekavianlatin]=Zmajev plejer dio
Name[sr@latin]=Zmajev plejer deo
Name[sv]=Dragon videodelprogram
Name[th]=ส่วนเล่นสื่อ Dragon Player
@@ -50,6 +53,7 @@
Name[zh_TW]=神龍播放器部件
Comment=Embeddable Video Player
Comment[ar]=مشغل فيديو مضمن
+Comment[ast]=Reproductor de vídeu empotrable
Comment[bg]=Вграден видео плеър
Comment[ca]=Reproductor de vídeo encastat
Comment[cs]=Vložený Video Přehrávač
@@ -86,8 +90,10 @@
Comment[ru]=Встраиваемый видеопроигрыватель
Comment[sk]=Vložiteľný prehrávač videa
Comment[sl]=Vgradni predvajalnik videov
-Comment[sr]=Угњездиви видео плејер
-Comment[sr@latin]=Ugnjezdivi video plejer
+Comment[sr]=Угнездиви видео плејер
+Comment[sr@ijekavian]=Угњездиви видео плејер
+Comment[sr@ijekavianlatin]=Ugnjezdivi video plejer
+Comment[sr@latin]=Ugnezdivi video plejer
Comment[sv]=Inbäddningsbar videospelare
Comment[th]=โปรแกรมเล่นวิดีโอแบบฝังตัวได้
Comment[tr]=Gömülebilir Video Oynatıcı
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer_play_dvd.desktop new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer_play_dvd.desktop
--- old/kdemultimedia-4.3.85/dragonplayer/misc/dragonplayer_play_dvd.desktop 2009-11-23 16:30:23.000000000 +0100
+++ new/kdemultimedia-4.3.90/dragonplayer/misc/dragonplayer_play_dvd.desktop 2010-01-06 18:01:10.000000000 +0100
@@ -7,6 +7,7 @@
[Desktop Action Play]
Name=Play DVD with Dragon Player
Name[ar]=شغل ال DVD بواسطة الدراجن بلاير
+Name[ast]=Reproducir el DVD con Dragon Player
Name[bg]=Изпълнение на DVD с Dragon
Name[ca]=Reprodueix DVD amb el Dragon Player
Name[cs]=Přehrát DVD pomocí přehrávače Dragon
@@ -44,6 +45,8 @@
Name[sk]=Prehrať DVD pomocou prehrávača Dragon
Name[sl]=Predvajaj DVD z Dragon Player
Name[sr]=Пусти ДВД Змајевим плејером
+Name[sr@ijekavian]=Пусти ДВД Змајевим плејером
+Name[sr@ijekavianlatin]=Pusti DVD Zmajevim plejerom
Name[sr@latin]=Pusti DVD Zmajevim plejerom
Name[sv]=Spela dvd med Dragon videospelare
Name[th]=เล่นแผ่นดีวีดีด้วยโปรแกรมเล่นสื่อ Dragon Player
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/juk/juk.desktop new/kdemultimedia-4.3.90/juk/juk.desktop
--- old/kdemultimedia-4.3.85/juk/juk.desktop 2009-09-23 21:24:16.000000000 +0200
+++ new/kdemultimedia-4.3.90/juk/juk.desktop 2010-01-06 18:01:10.000000000 +0100
@@ -9,6 +9,7 @@
Terminal=false
Name=JuK
Name[ar]=JuK
+Name[ast]=JuK
Name[be]=JuK
Name[bg]=JuK
Name[bn]=জুক
@@ -58,6 +59,8 @@
Name[sk]=JuK
Name[sl]=JuK
Name[sr]=Џук
+Name[sr@ijekavian]=Џук
+Name[sr@ijekavianlatin]=Juk
Name[sr@latin]=Juk
Name[sv]=Juk
Name[ta]=JuK
@@ -74,6 +77,7 @@
Name[zh_TW]=JuK
GenericName=Music Player
GenericName[ar]=مشغل الموسيقى
+GenericName[ast]=Reproductor de música
GenericName[bg]=Музикален плеър
GenericName[br]=C'hoarier ar sonerezh
GenericName[ca]=Reproductor musical
@@ -121,6 +125,8 @@
GenericName[sk]=Prehrávač hudby
GenericName[sl]=Glasbeni predvajalnik
GenericName[sr]=Музички плејер
+GenericName[sr@ijekavian]=Музички плејер
+GenericName[sr@ijekavianlatin]=Muzički plejer
GenericName[sr@latin]=Muzički plejer
GenericName[sv]=Musikspelare
GenericName[ta]=இசை இயக்கி
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/juk/juk.notifyrc new/kdemultimedia-4.3.90/juk/juk.notifyrc
--- old/kdemultimedia-4.3.85/juk/juk.notifyrc 2009-12-11 00:15:09.000000000 +0100
+++ new/kdemultimedia-4.3.90/juk/juk.notifyrc 2010-01-06 18:01:10.000000000 +0100
@@ -2,6 +2,7 @@
IconName=juk
Comment=Music Player
Comment[ar]=مشغل الموسيقى
+Comment[ast]=Reproductor de música
Comment[bg]=Програма за изпълнение на музика
Comment[ca]=Reproductor musical
Comment[cs]=Přehrávač hudby
@@ -35,6 +36,8 @@
Comment[sk]=Prehrávač hudby
Comment[sl]=Glasbeni predvajalnik
Comment[sr]=Музички плејер
+Comment[sr@ijekavian]=Музички плејер
+Comment[sr@ijekavianlatin]=Muzički plejer
Comment[sr@latin]=Muzički plejer
Comment[sv]=Musikspelare
Comment[tr]=Müzik Çalar
@@ -45,6 +48,7 @@
Comment[zh_TW]=音樂播放器
Name=JuK
Name[ar]=JuK
+Name[ast]=JuK
Name[be]=JuK
Name[bg]=JuK
Name[bn]=জুক
@@ -94,6 +98,8 @@
Name[sk]=JuK
Name[sl]=JuK
Name[sr]=Џук
+Name[sr@ijekavian]=Џук
+Name[sr@ijekavianlatin]=Juk
Name[sr@latin]=Juk
Name[sv]=Juk
Name[ta]=JuK
@@ -112,6 +118,7 @@
[Event/coverDownloaded]
Name=Cover Successfully Downloaded
Name[ar]=نزل الغلاف بنجاح
+Name[ast]=La carátula descargóse con éxitu
Name[bg]=Обложката е успешно изтеглена
Name[ca]=La caràtula s'ha descarregat correctament
Name[cs]=Obal úspěšně stažen
@@ -145,6 +152,8 @@
Name[sk]=Obal úspešne stiahnutý
Name[sl]=Ovitek uspešno pridobljen
Name[sr]=Омот успешно преузет
+Name[sr@ijekavian]=Омот успјешно преузет
+Name[sr@ijekavianlatin]=Omot uspješno preuzet
Name[sr@latin]=Omot uspešno preuzet
Name[sv]=Omslag nerladdat med lyckat resultat
Name[tr]=Kapak Başarılı Şekilde İndirildi
@@ -155,6 +164,7 @@
Name[zh_TW]=已成功下載封面
Comment=A requested cover has been downloaded
Comment[ar]=نزل الغلاف المطلوب
+Comment[ast]=Descargóse la carátula solicitada
Comment[bg]=Търсената обложка е изтеглена
Comment[ca]=S'ha descarregat la caràtula demanada
Comment[cs]=Vyžádaný obal se byl údpěšně stažen
@@ -188,6 +198,8 @@
Comment[sk]=Požadovaný obal bol stiahnutý
Comment[sl]=Zahtevan ovitek je bil uspešno pridobljen
Comment[sr]=Затражени омот је преузет
+Comment[sr@ijekavian]=Затражени омот је преузет
+Comment[sr@ijekavianlatin]=Zatraženi omot je preuzet
Comment[sr@latin]=Zatraženi omot je preuzet
Comment[sv]=Ett begärt omslag har laddats ner
Comment[tr]=İstenilen kapak indirildi
@@ -201,6 +213,7 @@
[Event/coverFailed]
Name=Cover Failed to Download
Name[ar]=فشل تنزيل الغلاف
+Name[ast]=Fallu al baxar la carátula
Name[bg]=Грешка при изтегляне на обложката
Name[ca]=Ha fallat la descàrrega de la caràtula
Name[cs]=Obal se nepovedlo stáhnout
@@ -234,6 +247,8 @@
Name[sk]=Obal sa nepodarilo stiahnuť
Name[sl]=Pridobitev ovitka ni uspela
Name[sr]=Омот се не може преузети
+Name[sr@ijekavian]=Омот се не може преузети
+Name[sr@ijekavianlatin]=Omot se ne može preuzeti
Name[sr@latin]=Omot se ne može preuzeti
Name[sv]=Nerladdning av omslag misslyckades
Name[tr]=Kapak İndirilemedi
@@ -244,6 +259,7 @@
Name[zh_TW]=下載封面失敗
Comment=A requested cover has failed to download
Comment[ar]=فشل تنزيل الغلاف المطلوب
+Comment[ast]=Fallu al baxar la carátula solicitada
Comment[bg]=Търсената обложка не е изтеглена
Comment[ca]=Una petició de descàrrega de caràtula ha fallat
Comment[cs]=Vyžádaný obal se nepovedlo stáhnout
@@ -277,6 +293,8 @@
Comment[sk]=Požadovaný obal sa nepodarilo stiahnuť
Comment[sl]=Zahtevan ovitek ni bil uspešno pridobljen
Comment[sr]=Преузимање затраженог омота није успело
+Comment[sr@ijekavian]=Преузимање затраженог омота није успјело
+Comment[sr@ijekavianlatin]=Preuzimanje zatraženog omota nije uspjelo
Comment[sr@latin]=Preuzimanje zatraženog omota nije uspelo
Comment[sv]=Nerladdning av ett begärt omslag har misslyckats
Comment[tr]=İstenilen kapak indirilemedi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/juk/jukservicemenu.desktop new/kdemultimedia-4.3.90/juk/jukservicemenu.desktop
--- old/kdemultimedia-4.3.85/juk/jukservicemenu.desktop 2009-09-23 21:24:16.000000000 +0200
+++ new/kdemultimedia-4.3.90/juk/jukservicemenu.desktop 2010-01-06 18:01:10.000000000 +0100
@@ -6,6 +6,7 @@
[Desktop Action addToCollection]
Name=Add to JuK Collection
Name[ar]=إضافة إلى مجموعة JuK
+Name[ast]=Amestar a coleición de JuK
Name[bg]=Добавяне към колекцията на JuK
Name[bn]=জুক সংকলনে যোগ করো
Name[br]=Ouzhpennañ d'an dastumad JuK
@@ -54,6 +55,8 @@
Name[sk]=Pridať do kolekcie JuK
Name[sl]=Dodaj v zbirko JuK
Name[sr]=Додај у Џукову збирку
+Name[sr@ijekavian]=Додај у Џукову збирку
+Name[sr@ijekavianlatin]=Dodaj u Jukovu zbirku
Name[sr@latin]=Dodaj u Jukovu zbirku
Name[sv]=Lägg till i Juk-samlingslista
Name[ta]=JuK திரட்டிக்கு சேர்
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/CMakeLists.txt new/kdemultimedia-4.3.90/kioslave/audiocd/CMakeLists.txt
--- old/kdemultimedia-4.3.85/kioslave/audiocd/CMakeLists.txt 2008-10-17 13:01:46.000000000 +0200
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/CMakeLists.txt 2009-12-31 14:30:01.000000000 +0100
@@ -1,8 +1,5 @@
project(audiocd)
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
MACRO_PUSH_REQUIRED_VARS()
SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include/cdda)
check_struct_member("struct cdrom_drive" "ioctl_device_name" "cdda_interface.h" CDDA_IOCTL_DEVICE_EXISTS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/audiocd.cpp new/kdemultimedia-4.3.90/kioslave/audiocd/audiocd.cpp
--- old/kdemultimedia-4.3.85/kioslave/audiocd/audiocd.cpp 2009-02-04 19:21:18.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/audiocd.cpp 2009-12-31 14:30:01.000000000 +0100
@@ -103,11 +103,10 @@
class AudioCDProtocol::Private {
public:
- Private() : cd(KCompactDisc::Asynchronous) {
+ Private() {
clearURLargs();
s_info = i18n("Information");
s_fullCD = i18n("Full CD");
- discid = 0;
}
void clearURLargs() {
@@ -116,6 +115,28 @@
req_track = -1;
cddbUserChoice = -1;
}
+
+ bool tocsAreDifferent(struct cdrom_drive *drive)
+ {
+ if (tracks != (uint)drive->tracks) return true;
+ for (int i = 0; i < drive->tracks; ++i)
+ {
+ if (disc_toc[i].dwStartSector != drive->disc_toc[i].dwStartSector ||
+ disc_toc[i].bFlags != drive->disc_toc[i].bFlags ||
+ disc_toc[i].bTrack != drive->disc_toc[i].bTrack) return true;
+ }
+ return false;
+ }
+
+ void setToc(struct cdrom_drive *drive)
+ {
+ for (int i = 0; i < drive->tracks; ++i)
+ {
+ disc_toc[i].dwStartSector = drive->disc_toc[i].dwStartSector;
+ disc_toc[i].bFlags = drive->disc_toc[i].bFlags;
+ disc_toc[i].bTrack = drive->disc_toc[i].bTrack;
+ }
+ }
// The type/which of request
bool req_allTracks;
@@ -134,10 +155,9 @@
QString s_fullCD;
// Current CD
- unsigned discid;
+ TOC disc_toc[MAXTRK];
unsigned tracks;
bool trackIsAudio[100];
- KCompactDisc cd; // keep it around so that we don't assume the disk changed between every stat()
// CDDB items
KCDDB::Result cddbResult;
@@ -195,29 +215,10 @@
return encoderFromExtension(filename.right(len - pos));
}
-struct cdrom_drive * AudioCDProtocol::initRequest(const KUrl & url)
+static void setDeviceToCd(KCompactDisc *cd, struct cdrom_drive *drive)
{
- if (url.hasHost())
- {
- error(KIO::ERR_UNSUPPORTED_ACTION,
- i18n("You cannot specify a host with this protocol. "
- "Please use the audiocd:/ format instead."));
- return 0;
- }
-
- // Load OUR Settings.
- loadSettings();
- // Then url parameters can overrule our settings.
- parseURLArgs(url);
-
- struct cdrom_drive * drive = getDrive();
- if (0 == drive)
- return 0;
-
- // Update our knowledge of the disc
#if defined(HAVE_CDDA_IOCTL_DEVICE)
- if (d->cd.deviceName() != drive->ioctl_device_name)
- d->cd.setDevice(drive->ioctl_device_name, 50, false);
+ cd->setDevice(drive->ioctl_device_name, 50, false);
#elif defined(__FreeBSD__) || defined(__DragonFly__)
// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
// support for non-SCSI devices. Although it finds ATA cdroms just
@@ -231,14 +232,14 @@
// user selected value, even if there is none.
//
kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user.";
- d->cd.setDevice( d->device );
+ cd->setDevice( d->device );
}
else
{
kDebug(7117) << "Found a SCSI or ATAPICAM device.";
if ( strlen(drive->dev->device_path) > 0 )
{
- d->cd.setDevice( drive->dev->device_path );
+ cd->setDevice( drive->dev->device_path );
}
else
{
@@ -250,7 +251,7 @@
.arg( drive->dev->given_dev_name )
.arg( drive->dev->given_unit_number ) ;
kDebug(7117) << " Using derived name " << devname;
- d->cd.setDevice( devname );
+ cd->setDevice( devname );
}
}
#else
@@ -258,16 +259,40 @@
#warning audiocd ioslave is not going to work for you
#endif
#endif
+}
+struct cdrom_drive * AudioCDProtocol::initRequest(const KUrl & url)
+{
+ if (url.hasHost())
+ {
+ error(KIO::ERR_UNSUPPORTED_ACTION,
+ i18n("You cannot specify a host with this protocol. "
+ "Please use the audiocd:/ format instead."));
+ return 0;
+ }
+
+ // Load OUR Settings.
+ loadSettings();
+ // Then url parameters can overrule our settings.
+ parseURLArgs(url);
- if (d->cd.discId() != d->discid && !d->cd.isNoDisc()) {
- d->discid = d->cd.discId();
- d->tracks = d->cd.tracks();
- for(uint i=0; i< d->cd.tracks(); i++)
- d->trackIsAudio[i] = d->cd.isAudio(i+1);
+ struct cdrom_drive * drive = getDrive();
+ if (0 == drive)
+ return 0;
+
+ if (d->tocsAreDifferent(drive))
+ {
+ // Update our knowledge of the disc
+ KCompactDisc cd(KCompactDisc::Asynchronous);
+ setDeviceToCd(&cd, drive);
+ d->setToc(drive);
+
+ d->tracks = cd.tracks();
+ for(uint i=0; i< cd.tracks(); i++)
+ d->trackIsAudio[i] = cd.isAudio(i+1);
KCDDB::Client c;
- d->cddbResult = c.lookup(d->cd.discSignature());
+ d->cddbResult = c.lookup(cd.discSignature());
if (d->cddbResult == Success)
{
d->cddbList = c.lookupResponse();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/audiocd.h new/kdemultimedia-4.3.90/kioslave/audiocd/audiocd.h
--- old/kdemultimedia-4.3.85/kioslave/audiocd/audiocd.h 2008-01-05 01:02:15.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/audiocd.h 2009-12-31 14:30:01.000000000 +0100
@@ -87,7 +87,6 @@
);
struct cdrom_drive *initRequest(const KUrl &);
- uint discid(struct cdrom_drive *);
/**
* Add an entry in the KIO directory, using the title you give,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/data/audiocd.desktop new/kdemultimedia-4.3.90/kioslave/audiocd/data/audiocd.desktop
--- old/kdemultimedia-4.3.85/kioslave/audiocd/data/audiocd.desktop 2009-11-23 16:30:24.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/data/audiocd.desktop 2010-01-06 18:01:11.000000000 +0100
@@ -4,6 +4,7 @@
Icon=media-optical-audio
Name=Audio CD Browser
Name[ar]=متصفح الأقراص المدمجة الصوتية
+Name[ast]=Restolador de CD d'audiu
Name[bg]=Разглеждане на аудио дискове
Name[ca]=Navegador de CD d'àudio
Name[cs]=Prohlížeč zvukových CD
@@ -41,6 +42,8 @@
Name[sk]=Prehliadač zvukových CD
Name[sl]=Brskalnik po glasbenih CD-jih
Name[sr]=Прегледач аудио ЦД‑ова
+Name[sr@ijekavian]=Прегледач аудио ЦД‑ова
+Name[sr@ijekavianlatin]=Pregledač audio CD‑ova
Name[sr@latin]=Pregledač audio CD‑ova
Name[sv]=Bläddra ljud-cd
Name[th]=เรียกดูซีดีเสียง
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/data/solid_audiocd.desktop new/kdemultimedia-4.3.90/kioslave/audiocd/data/solid_audiocd.desktop
--- old/kdemultimedia-4.3.85/kioslave/audiocd/data/solid_audiocd.desktop 2009-12-11 00:15:10.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/data/solid_audiocd.desktop 2010-01-06 18:01:11.000000000 +0100
@@ -17,6 +17,8 @@
Name[en_GB]=Open with File Manager
Name[es]=Abrir con el gestor de archivos
Name[et]=Ava failihalduriga
+Name[fr]=Ouvrir avec le gestionnaire de fichiers
+Name[gl]=Abrir co xestor de ficheiros
Name[hu]=Megnyitás a fájlkezelővel
Name[is]=Opna með skráastjóra
Name[ko]=파일 관리자로 열기
@@ -26,7 +28,10 @@
Name[pt]=Abrir com o Gestor de Ficheiros
Name[pt_BR]=Abrir com o gerenciador de arquivos
Name[ru]=Открыть в диспетчере файлов
+Name[sk]=Otvoriť v správcovi súborov
Name[sr]=Отвори менаџером фајлова
+Name[sr@ijekavian]=Отвори менаџером фајлова
+Name[sr@ijekavianlatin]=Otvori menadžerom fajlova
Name[sr@latin]=Otvori menadžerom fajlova
Name[sv]=Öppna med filhanterare
Name[tr]=Dosya Yöneticisi ile Aç
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-4.3.90/kioslave/audiocd/kcmaudiocd/audiocd.desktop
--- old/kdemultimedia-4.3.85/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2009-11-23 16:30:24.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2010-01-06 18:01:11.000000000 +0100
@@ -11,6 +11,7 @@
Name=Audio CDs
Name[af]=Audio Cds
Name[ar]=الأقراص الصوتية
+Name[ast]=CD d'audiu
Name[bg]=Аудио дискове
Name[bn]=অডিও সিডি
Name[br]=CD klevet
@@ -61,6 +62,8 @@
Name[sk]=Zvukové CD
Name[sl]=Avdio CD-ji
Name[sr]=Аудио ЦД‑ови
+Name[sr@ijekavian]=Аудио ЦД‑ови
+Name[sr@ijekavianlatin]=Audio CD‑ovi
Name[sr@latin]=Audio CD‑ovi
Name[sv]=Ljud-cd
Name[ta]=கேட்பொலி குறுந்தகடுகள்
@@ -79,6 +82,7 @@
Comment=Audiocd IO Slave Configuration
Comment[af]=Klank cd Io Slaaf Opstelling
Comment[ar]=إعدادات Audiocd IO Slave
+Comment[ast]=Configuración del esclavu d'E/S d'audiocd
Comment[bg]=Настройки на аудио диска
Comment[bn]=অডিও-সিডি আই/ও স্লেভ কনফিগারেশন
Comment[br]=Kefluniadur Sklav IO Audiocd
@@ -128,13 +132,15 @@
Comment[sk]=Nastavenie IO klienta pre zvukové CD
Comment[sl]=Nastavitve Audiocd podrejeni V/I
Comment[sr]=Подешавање У/И захвата за аудио ЦД‑ове
+Comment[sr@ijekavian]=Подешавање У/И захвата за аудио ЦД‑ове
+Comment[sr@ijekavianlatin]=Podešavanje U/I zahvata za audio CD‑ove
Comment[sr@latin]=Podešavanje U/I zahvata za audio CD‑ove
Comment[sv]=Anpassa I/O-slav för ljud-cd
Comment[ta]=ஒலிக் குறுந்தகடு உள்-வெளி அடிமை வடிவமைப்பு
Comment[tg]=Танзими Фармонбари Ворид/Хориҷи Дискҳои Фишурдаи Садо
Comment[th]=ปรับแต่ง Audiocd IO Slave
Comment[tr]=Müzik CD Yapılandırması
-Comment[uk]=Налаштування підлеглого В/В "Audiocd"
+Comment[uk]=Налаштування підлеглого В/В «Audiocd»
Comment[wa]=Apontiaedje do vårlet d' I/R audiocd
Comment[xh]=Video-DVD IO Slave Uqwalaselo
Comment[x-test]=xxAudiocd IO Slave Configurationxx
@@ -143,6 +149,7 @@
Comment[zh_TW]=音樂光碟 IO Slave 組態
Keywords=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate
Keywords[ar]=قرص مدمج صوتى، صوت، قرص مدمج، Ogg ، Vorbis ،الترميز، CDDA ،معدل البت
+Keywords[ast]=CD d'audio,CD,Ogg,Vorbis,Codificación,CDDA,Tasa de bits
Keywords[bg]=аудио,диск,компактдиск,КД,кодек,музика,Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate
Keywords[bn]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate
Keywords[br]=CD klevet,CD,Ogg,Vorbis,Kodadur,CDDA,Feur
@@ -191,6 +198,8 @@
Keywords[sk]=zvukové CD,CD,Ogg,Vorbis,kódovanie,CDDA,dátový tok
Keywords[sl]=Avdio CD,CD,Ogg,Vorbis,kodiranje,CDDA,bitna hitrost
Keywords[sr]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,Аудио ЦД,кодирање,проток
+Keywords[sr@ijekavian]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,Аудио ЦД,кодирање,проток
+Keywords[sr@ijekavianlatin]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,Audio CD,kodiranje,protok
Keywords[sr@latin]=Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate,Audio CD,kodiranje,protok
Keywords[sv]=ljud-cd,cd,Ogg,Vorbis,kodning,CDDA,bithastighet
Keywords[ta]=கேட்பொலி குறுந்தகடு,குறுந்தகடு,ஓஜிஜி,வோர்பிஸ்,குறியிடுதல்,சிடிடேஏ,பிட் மதிப்பு
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/plugins/flac/encoderflac.cpp new/kdemultimedia-4.3.90/kioslave/audiocd/plugins/flac/encoderflac.cpp
--- old/kdemultimedia-4.3.85/kioslave/audiocd/plugins/flac/encoderflac.cpp 2009-01-06 18:28:08.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/plugins/flac/encoderflac.cpp 2009-12-31 14:30:00.000000000 +0100
@@ -66,9 +66,9 @@
QByteArray output;
if (bytes) {
- output.setRawData((const char*)buffer, bytes);
+ output = QByteArray::fromRawData((const char*)buffer, bytes);
d->ioslave->data(output);
- output.resetRawData((const char*)buffer, bytes);
+ output.clear();
}
return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/plugins/lame/collectingprocess.cpp new/kdemultimedia-4.3.90/kioslave/audiocd/plugins/lame/collectingprocess.cpp
--- old/kdemultimedia-4.3.85/kioslave/audiocd/plugins/lame/collectingprocess.cpp 2008-11-12 17:38:31.000000000 +0100
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/plugins/lame/collectingprocess.cpp 2009-12-31 14:30:01.000000000 +0100
@@ -96,7 +96,8 @@
}
uint offset = 0;
- QByteArray b( d->stdoutSize );
+ QByteArray b;
+ if (d->stdoutSize > 0) b.fill('\0', d->stdoutSize);
for ( QList<QByteArray>::const_iterator it = d->stdoutBuffer.constBegin();
it != d->stdoutBuffer.constEnd();
++it ) {
@@ -116,7 +117,8 @@
}
uint offset = 0;
- QByteArray b( d->stderrSize );
+ QByteArray b;
+ if (d->stderrSize > 0) b.fill('\0', d->stderrSize);
for ( QList<QByteArray>::const_iterator it = d->stderrBuffer.constBegin();
it != d->stderrBuffer.constEnd();
++it ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.3.85/kioslave/audiocd/plugins/wav/encodercda.cpp new/kdemultimedia-4.3.90/kioslave/audiocd/plugins/wav/encodercda.cpp
--- old/kdemultimedia-4.3.85/kioslave/audiocd/plugins/wav/encodercda.cpp 2008-09-26 16:57:16.000000000 +0200
+++ new/kdemultimedia-4.3.90/kioslave/audiocd/plugins/wav/encodercda.cpp 2009-12-31 14:30:01.000000000 +0100
@@ -62,9 +62,9 @@
for (int i=0; i < 2 * frames; i++)
buf[i] = swap16 (buf[i]);
char * cbuf = reinterpret_cast