Hello community,
here is the log from the commit of package kdemultimedia4
checked in at Wed Jul 9 21:35:40 CEST 2008.
--------
--- KDE/kdemultimedia4/kdemultimedia4.changes 2008-06-26 17:48:00.000000000 +0200
+++ kdemultimedia4/kdemultimedia4.changes 2008-07-04 00:21:56.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jul 4 00:21:53 CEST 2008 - dmueller@suse.de
+
+- update to 4.0.85
+
+-------------------------------------------------------------------
Old:
----
kdemultimedia-4.0.84.tar.bz2
New:
----
kdemultimedia-4.0.85.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdemultimedia4.spec ++++++
--- /var/tmp/diff_new_pack.zl6193/_old 2008-07-09 21:33:37.000000000 +0200
+++ /var/tmp/diff_new_pack.zl6193/_new 2008-07-09 21:33:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdemultimedia4 (Version 4.0.84)
+# spec file for package kdemultimedia4 (Version 4.0.85)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
Group: System/GUI/KDE
Summary: kdemultimedia base package
Url: http://www.kde.org
-Version: 4.0.84
+Version: 4.0.85
Release: 1
Source0: kdemultimedia-%version.tar.bz2
Source1: _upstream
@@ -298,6 +298,8 @@
%doc COPYING COPYING.DOC README
%changelog
+* Fri Jul 04 2008 dmueller@suse.de
+- update to 4.0.85
* Thu Jun 26 2008 dmueller@suse.de
- update to 4.0.84
* Wed Jun 18 2008 dmueller@suse.de
++++++ kdemultimedia-4.0.84.tar.bz2 -> kdemultimedia-4.0.85.tar.bz2 ++++++
Files old/kdemultimedia-4.0.84/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.0.85/doc/dragonplayer/index.cache.bz2 differ
Files old/kdemultimedia-4.0.84/doc/juk/index.cache.bz2 and new/kdemultimedia-4.0.85/doc/juk/index.cache.bz2 differ
Files old/kdemultimedia-4.0.84/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.0.85/doc/kmix/index.cache.bz2 differ
Files old/kdemultimedia-4.0.84/doc/kscd/index.cache.bz2 and new/kdemultimedia-4.0.85/doc/kscd/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/dragonplayer/misc/dragonplayer.desktop new/kdemultimedia-4.0.85/dragonplayer/misc/dragonplayer.desktop
--- old/kdemultimedia-4.0.84/dragonplayer/misc/dragonplayer.desktop 2008-06-25 09:57:43.000000000 +0200
+++ new/kdemultimedia-4.0.85/dragonplayer/misc/dragonplayer.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -31,6 +31,7 @@
GenericName[lt]=Video grotuvas
GenericName[lv]=Video atskaņotājs
GenericName[nds]=Videoafspeler
+GenericName[nl]=Videospeler
GenericName[pt]=Leitor de Vídeo
GenericName[pt_BR]=Reprodutor de Vídeo
GenericName[sv]=Videospelare
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/dragonplayer/misc/dragonplayer_part.desktop new/kdemultimedia-4.0.85/dragonplayer/misc/dragonplayer_part.desktop
--- old/kdemultimedia-4.0.84/dragonplayer/misc/dragonplayer_part.desktop 2008-06-25 09:57:43.000000000 +0200
+++ new/kdemultimedia-4.0.85/dragonplayer/misc/dragonplayer_part.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -12,8 +12,10 @@
Name[gl]=Componente do Dragon Player
Name[hu]=Dragon Player objektum
Name[km]=ផ្នែកកម្មវិធីចាក់របស់ Dragon
+Name[lt]=Dragon Player dalis
Name[lv]=Dragon Player daļa
Name[nds]=Draken-Spelerkomponent
+Name[nl]=Dragon Player-component
Name[pt]=Componente do Dragon Player
Name[pt_BR]=Parte do Dragon Player
Name[sv]=Dragon videodelprogram
@@ -23,6 +25,7 @@
Name[zh_TW]=神龍播放器部件
Comment=Embeddable Video Player
Comment[ca]=Reproductor de vídeo encastat
+Comment[cs]=Vložený Video Přehrávač
Comment[da]=Videoafspiller som kan indlejres
Comment[de]=Eingebettete Video-Wiedergabe
Comment[el]=Ενσωματώσιμος αναπαραγωγέας βίντεο
@@ -34,8 +37,10 @@
Comment[ja]=埋め込み可能な動画プレーヤー
Comment[km]=កម្មវិធីចាក់វីដេអូដែលអាចបង្កប់បាន
Comment[ko]=끼워넣을 수 있는 동영상 재생기
+Comment[lt]=Įdėtas media grotuvas
Comment[lv]=Iegulstams video atskaņotājs
Comment[nds]=Inbettbor Videoafspeler
+Comment[nl]=Inbedbare videospeler
Comment[pt]=Leitor de Vídeo Incorporado
Comment[pt_BR]=Reprodutor de Vídeo Embutível
Comment[sv]=Inbäddningsbar videospelare
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/dragonplayer/misc/dragonplayer_play_dvd.desktop new/kdemultimedia-4.0.85/dragonplayer/misc/dragonplayer_play_dvd.desktop
--- old/kdemultimedia-4.0.84/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-06-25 09:57:43.000000000 +0200
+++ new/kdemultimedia-4.0.85/dragonplayer/misc/dragonplayer_play_dvd.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -19,8 +19,10 @@
Name[ja]=Dragon プレーヤーで DVD を再生
Name[km]=ចាក់ DVD ជាមួយកម្មវិធីចាក់ Dragon
Name[ko]=Dragon 플레이어로 DVD 보기
+Name[lt]=Groti DVD su Dragon Player
Name[lv]=Atskaņot DVD ar Dragon Player
Name[nds]=DVD mit den Draken-Speler afspelen
+Name[nl]=DVD met Dragon Player afspelen
Name[pt]=Reproduzir o DVD com o Dragon Player
Name[pt_BR]=Reproduza um DVD com o Dragon Player
Name[sv]=Spela dvd med Dragon videospelare
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/dragonplayer/src/app/mainWindow.cpp new/kdemultimedia-4.0.85/dragonplayer/src/app/mainWindow.cpp
--- old/kdemultimedia-4.0.84/dragonplayer/src/app/mainWindow.cpp 2008-06-18 14:42:28.000000000 +0200
+++ new/kdemultimedia-4.0.85/dragonplayer/src/app/mainWindow.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -94,6 +94,7 @@
, m_playDialog( 0 )
, m_fullScreenAction( 0 )
, m_stopScreenSaver( 0 )
+ , m_toolbarIsHidden(false)
{
DEBUG_BLOCK
s_instance = this;
@@ -606,11 +607,17 @@
DEBUG_BLOCK
debug() << "Setting full screen to " << isFullScreen;
mainWindow()->setWindowState( mainWindow()->windowState() ^ Qt::WindowFullScreen );
- //setWindowState( windowState() & ( full ? Qt::WindowFullScreen : ~Qt::WindowFullScreen ) );
static FullScreenToolBarHandler *s_handler;
- //toolBar()->setMovingEnabled( !isFullScreen );
- toolBar()->setHidden( isFullScreen );
+ if(isFullScreen)
+ {
+ m_toolbarIsHidden=toolBar()->isHidden();
+ toolBar()->setHidden( false );
+ }
+ else
+ {
+ toolBar()->setHidden(m_toolbarIsHidden);
+ }
menuBar()->setHidden( isFullScreen );
statusBar()->setHidden( isFullScreen );
if( m_leftDock )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/dragonplayer/src/app/mainWindow.h new/kdemultimedia-4.0.85/dragonplayer/src/app/mainWindow.h
--- old/kdemultimedia-4.0.84/dragonplayer/src/app/mainWindow.h 2008-03-06 10:51:32.000000000 +0100
+++ new/kdemultimedia-4.0.85/dragonplayer/src/app/mainWindow.h 2008-07-03 07:06:31.000000000 +0200
@@ -110,6 +110,7 @@
QPointer<PlayDialog> m_playDialog;
FullScreenAction *m_fullScreenAction;
KNotificationRestrictions *m_stopScreenSaver;
+ bool m_toolbarIsHidden;
QActionGroup *m_aspectRatios;
//undefined
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/juk/CMakeLists.txt new/kdemultimedia-4.0.85/juk/CMakeLists.txt
--- old/kdemultimedia-4.0.84/juk/CMakeLists.txt 2008-06-18 14:42:28.000000000 +0200
+++ new/kdemultimedia-4.0.85/juk/CMakeLists.txt 2008-07-03 07:06:31.000000000 +0200
@@ -23,7 +23,11 @@
########### next target ###############
# hack, should taglib maybe give the .. directory as well in it's config file?
-add_definitions(${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/..")
+if(WIN32)
+ include_directories( ${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}/.. )
+else(WIN32)
+ add_definitions( ${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/.." )
+endif(WIN32)
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=65432)
add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DQT_STL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/juk/juk.desktop new/kdemultimedia-4.0.85/juk/juk.desktop
--- old/kdemultimedia-4.0.84/juk/juk.desktop 2008-06-25 09:57:43.000000000 +0200
+++ new/kdemultimedia-4.0.85/juk/juk.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,6 +1,5 @@
# KDE Config File
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Exec=juk -caption "%c" %i
Icon=juk
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/juk/jukservicemenu.desktop new/kdemultimedia-4.0.85/juk/jukservicemenu.desktop
--- old/kdemultimedia-4.0.84/juk/jukservicemenu.desktop 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/juk/jukservicemenu.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
ServiceTypes=KonqPopupMenu/Plugin,application/ogg,audio/x-vorbis+ogg,audio/mpeg,audio/x-flac,audio/x-flac+ogg,audio/x-musepack
Type=Service
Actions=addToCollection;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/juk/systemtray.cpp new/kdemultimedia-4.0.85/juk/systemtray.cpp
--- old/kdemultimedia-4.0.84/juk/systemtray.cpp 2008-06-26 16:39:38.000000000 +0200
+++ new/kdemultimedia-4.0.85/juk/systemtray.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -50,10 +50,6 @@
#include <QX11Info>
#endif
-#ifdef Q_CC_MSVC
-#include // For logical "and" instead of "&&"
-#endif
-
#include "tag.h"
#include "actioncollection.h"
#include "playermanager.h"
@@ -162,11 +158,11 @@
anchor.setY(qMax(iconRect.top(), curScreen.bottom()));
// Now make our rect hit that anchor.
- if(onTop and onRight)
+ if(onTop && onRight)
r.moveTopLeft(anchor);
- else if(onTop and !onRight)
+ else if(onTop && !onRight)
r.moveTopRight(anchor);
- else if(!onTop and onRight)
+ else if(!onTop && onRight)
r.moveBottomLeft(anchor);
else
r.moveBottomRight(anchor);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/juk/tests/CMakeLists.txt new/kdemultimedia-4.0.85/juk/tests/CMakeLists.txt
--- old/kdemultimedia-4.0.84/juk/tests/CMakeLists.txt 2008-01-05 01:02:01.000000000 +0100
+++ new/kdemultimedia-4.0.85/juk/tests/CMakeLists.txt 2008-07-03 07:06:31.000000000 +0200
@@ -4,8 +4,11 @@
########### next target ###############
# hack, should taglib maybe give the .. directory as well in it's config file?
-add_definitions(${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/..")
-
+if(WIN32)
+ include_directories( ${TAGLIB_INCLUDES} ${TAGLIB_INCLUDES}/.. )
+else(WIN32)
+ add_definitions( ${TAGLIB_CFLAGS} "${TAGLIB_CFLAGS}/.." )
+endif(WIN32)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kioslave/audiocd/data/audiocd.desktop new/kdemultimedia-4.0.85/kioslave/audiocd/data/audiocd.desktop
--- old/kdemultimedia-4.0.84/kioslave/audiocd/data/audiocd.desktop 2008-06-11 10:33:52.000000000 +0200
+++ new/kdemultimedia-4.0.85/kioslave/audiocd/data/audiocd.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -16,8 +16,10 @@
Name[ja]=オーディオ CD ブラウザ
Name[km]=កម្មវិធីរុករកស៊ីឌីអូឌីយ៉ូ
Name[ko]=오디오 CD 탐색기
+Name[lt]=Audio CD naršyklė
Name[lv]=Audio CD pārlūks
Name[nds]=Klang-CD-Kieker
+Name[nl]=Audio-cd-browser
Name[pt]=Navegador de CDs de Áudio
Name[pt_BR]=Navegador de CDs de Áudio
Name[sv]=Bläddra ljud-cd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kioslave/audiocd/kcmaudiocd/audiocd.desktop new/kdemultimedia-4.0.85/kioslave/audiocd/kcmaudiocd/audiocd.desktop
--- old/kdemultimedia-4.0.84/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2008-06-03 11:34:59.000000000 +0200
+++ new/kdemultimedia-4.0.85/kioslave/audiocd/kcmaudiocd/audiocd.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Exec=kcmshell4 audiocd
Icon=media-optical-audio
Type=Service
@@ -38,7 +37,7 @@
Name[kk]=Аудио CD
Name[km]=ស៊ីឌីអូឌីយ៉ូ
Name[ko]=오디오 CD
-Name[lt]=Audio kompaktai
+Name[lt]=Audio CD
Name[lv]=Audio diski
Name[mk]=Аудио ЦД-а
Name[nb]=Lyd-CD-er
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kioslave/audiocd/plugins/CMakeLists.txt new/kdemultimedia-4.0.85/kioslave/audiocd/plugins/CMakeLists.txt
--- old/kdemultimedia-4.0.84/kioslave/audiocd/plugins/CMakeLists.txt 2008-06-10 13:41:37.000000000 +0200
+++ new/kdemultimedia-4.0.85/kioslave/audiocd/plugins/CMakeLists.txt 2008-07-03 07:06:31.000000000 +0200
@@ -31,5 +31,5 @@
########### install files ###############
-install( FILES audiocdencoder.h DESTINATION ${INCLUDE_INSTALL_DIR} )
+install( FILES audiocdencoder.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kmix/kmixapplet.desktop new/kdemultimedia-4.0.85/kmix/kmixapplet.desktop
--- old/kdemultimedia-4.0.84/kmix/kmixapplet.desktop 2008-06-03 11:34:59.000000000 +0200
+++ new/kdemultimedia-4.0.85/kmix/kmixapplet.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Plugin
Name=Sound Mixer
Name[bg]=Аудио миксер
@@ -29,6 +28,7 @@
Name[kk]=Дыбыс микшері
Name[km]=កម្មវិធីលាយសំឡេង
Name[ko]=소리 믹서
+Name[lt]=Garsų maišiklis
Name[lv]=Skaņas mikseris
Name[mk]=Миксета за звук
Name[ms]=Pengadun Bunyi
@@ -79,6 +79,7 @@
Comment[ja]=音量の表示とコントロール
Comment[km]=បង្ហាញ និងអនុញ្ញាតឲ្យអ្នកត្រួតពិនិត្យកម្រិតសំឡេង
Comment[ko]=소리 음량을 보여 주고 조정합니다
+Comment[lt]=Rodo ir leidžia valdyti garsumą
Comment[lv]=Parāda un ļauj kontrolēt skaņu skaļumu
Comment[nb]=Lar deg vise og kontrollere lydstyrke
Comment[nds]=Wiest de Luutstärk-Kuntrull
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kmix/kmix_autostart.desktop new/kdemultimedia-4.0.85/kmix/kmix_autostart.desktop
--- old/kdemultimedia-4.0.84/kmix/kmix_autostart.desktop 2008-06-10 13:41:37.000000000 +0200
+++ new/kdemultimedia-4.0.85/kmix/kmix_autostart.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Exec=kmix
DocPath=kmix/index.html
OnlyShowIn=KDE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kmix/kmixctrl_restore.desktop new/kdemultimedia-4.0.85/kmix/kmixctrl_restore.desktop
--- old/kdemultimedia-4.0.84/kmix/kmixctrl_restore.desktop 2008-06-03 11:34:59.000000000 +0200
+++ new/kdemultimedia-4.0.85/kmix/kmixctrl_restore.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=Restore Mixer Settings
Name[af]=Herstel Menger Instellings
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kmix/kmix.desktop new/kdemultimedia-4.0.85/kmix/kmix.desktop
--- old/kdemultimedia-4.0.84/kmix/kmix.desktop 2008-06-03 11:34:59.000000000 +0200
+++ new/kdemultimedia-4.0.85/kmix/kmix.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Exec=kmix -caption "%c" %i
X-DocPath=kmix/index.html
OnlyShowIn=KDE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kmix/kmix.notifyrc new/kdemultimedia-4.0.85/kmix/kmix.notifyrc
--- old/kdemultimedia-4.0.84/kmix/kmix.notifyrc 2008-06-10 13:41:37.000000000 +0200
+++ new/kdemultimedia-4.0.85/kmix/kmix.notifyrc 2008-07-03 07:06:31.000000000 +0200
@@ -19,6 +19,7 @@
Comment[ja]=サウンドミキサー
Comment[km]=កម្មវិធីលាយសំឡេង
Comment[ko]=소리 믹서
+Comment[lt]=Garsų maišiklis
Comment[lv]=Skaņas mikseris
Comment[mk]=Миксета за звук
Comment[nb]=Lydmikser
@@ -58,6 +59,7 @@
Name[ja]=オーディオデバイスのフォールバック
Name[km]=Fallback ឧបករណ៍អូឌីយ៉ូ
Name[ko]=오디오 장치 폴백
+Name[lt]=Atsarginis audio įrenginio variantas
Name[lv]=Audio ierīces atkāpšanās
Name[nb]=Skifte av lydenhet
Name[nds]=Klang-Opbackreedschap
@@ -94,6 +96,7 @@
Comment[ja]=優先デバイスが利用できないために自動的にフォールバックしたときの通知
Comment[km]=ការជូនដំណឹងលើ fallback ស្វ័យប្រវត្តិ ប្រសិនបើឧបករណ៍ដែលចូលចិត្តមិនមាន
Comment[ko]=선호하는 장치를 사용할 수 없을 때 다음 장치 자동 선택 알리
+Comment[lt]=Pranešimai apie automatinį atsarginį įrenginį, jei pageidautinas įrenginys neprieinamas, nenaudojami
Comment[lv]=Paziņo par automātisku atkāpšanās sistēmas izmantošanu, ja vēlamās ierīces nav pieejamas
Comment[nb]=Underretning dersom lydenheten skiftes automatisk fordi den foretrukne enheten ikke er tilgjengelig
Comment[nds]=Bescheed, wenn de vörtrocken Reedschap nich verföögbor is un de Opbackreedschap bruukt warrt
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kmix/restore_kmix_volumes.desktop new/kdemultimedia-4.0.85/kmix/restore_kmix_volumes.desktop
--- old/kdemultimedia-4.0.84/kmix/restore_kmix_volumes.desktop 2008-06-03 11:34:59.000000000 +0200
+++ new/kdemultimedia-4.0.85/kmix/restore_kmix_volumes.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
X-KDE-autostart-phase=1
X-KDE-autostart-condition=kmixrc:Global:startkdeRestore:true
Type=Application
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kscd/audiocd_play.desktop new/kdemultimedia-4.0.85/kscd/audiocd_play.desktop
--- old/kdemultimedia-4.0.84/kscd/audiocd_play.desktop 2008-01-29 10:20:21.000000000 +0100
+++ new/kdemultimedia-4.0.85/kscd/audiocd_play.desktop 2008-07-03 07:06:30.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
ServiceTypes=KonqPopupMenu/Plugin,media/audiocd
Type=Service
Actions=Play;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kscd/configWidgetUI.ui new/kdemultimedia-4.0.85/kscd/configWidgetUI.ui
--- old/kdemultimedia-4.0.84/kscd/configWidgetUI.ui 2008-01-05 01:01:58.000000000 +0100
+++ new/kdemultimedia-4.0.85/kscd/configWidgetUI.ui 2008-07-03 07:06:30.000000000 +0200
@@ -217,7 +217,7 @@
</widget>
</item>
<item row="2" column="1" >
- <widget class="QComboBox" name="kcfg_AudioSystem" >
+ <widget class="KComboBox" name="kcfg_AudioSystem" >
<property name="enabled" >
<bool>false</bool>
</property>
@@ -243,7 +243,7 @@
</widget>
</item>
<item row="3" column="1" >
- <widget class="QLineEdit" name="kcfg_AudioDevice" >
+ <widget class="KLineEdit" name="kcfg_AudioDevice" >
<property name="enabled" >
<bool>false</bool>
</property>
@@ -275,7 +275,7 @@
</widget>
</item>
<item>
- <widget class="QComboBox" name="kcfg_SelectedEncoding" >
+ <widget class="KComboBox" name="kcfg_SelectedEncoding" >
<property name="enabled" >
<bool>false</bool>
</property>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kscd/kscd.cpp new/kdemultimedia-4.0.85/kscd/kscd.cpp
--- old/kdemultimedia-4.0.84/kscd/kscd.cpp 2008-01-05 01:01:58.000000000 +0100
+++ new/kdemultimedia-4.0.85/kscd/kscd.cpp 2008-07-03 07:06:30.000000000 +0200
@@ -22,8 +22,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
-#include "docking.h"
+
#include "kscd.h"
+
+#include "docking.h"
#include "prefs.h"
#include "cddbdlg.h"
#include "configWidget.h"
@@ -1011,7 +1013,7 @@
* KDE 4.0 quick fix: it looks like the conversion to mode
* CDDB info into KCompactDisc wasn't finished, so we work around
* it here for now by explicitly overriding data from m_cd with
- * data from cddbInfo iff cddbInfo.isValid() &&
+ * data from cddbInfo iff cddbInfo.isValid() &&
* cddbInfo.numberOfTracks() == m_cd->tracks()
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kscd/kscd.desktop new/kdemultimedia-4.0.85/kscd/kscd.desktop
--- old/kdemultimedia-4.0.84/kscd/kscd.desktop 2008-06-25 09:57:43.000000000 +0200
+++ new/kdemultimedia-4.0.85/kscd/kscd.desktop 2008-07-03 07:06:30.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
GenericName=CD Player
GenericName[af]=Cd Speler
GenericName[bg]=Плеър за аудио дискове
@@ -73,7 +72,6 @@
Exec=kscd -caption "%c" %i
X-DocPath=kscd/index.html
Icon=kscd
-Path=
Type=Application
Terminal=false
X-KDE-StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/kscd/panel.ui new/kdemultimedia-4.0.85/kscd/panel.ui
--- old/kdemultimedia-4.0.84/kscd/panel.ui 2008-01-05 01:01:58.000000000 +0100
+++ new/kdemultimedia-4.0.85/kscd/panel.ui 2008-07-03 07:06:31.000000000 +0200
@@ -37,7 +37,7 @@
<number>0</number>
</property>
<item>
- <widget class="QComboBox" name="songListCB" />
+ <widget class="KComboBox" name="songListCB" />
</item>
<item>
<layout class="QHBoxLayout" >
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcddb/kcmcddb/libkcddb.desktop new/kdemultimedia-4.0.85/libkcddb/kcmcddb/libkcddb.desktop
--- old/kdemultimedia-4.0.84/libkcddb/kcmcddb/libkcddb.desktop 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/libkcddb/kcmcddb/libkcddb.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Exec=kcmshell4 libkcddb
Icon=media-optical-audio
Type=Service
@@ -151,7 +150,7 @@
Comment[kk]=CDDB деректер алуды баптау
Comment[km]=កំណត់រចនាសម្ព័ន្ធការទៅយក CDDB
Comment[ko]=CDDB 가져오기 설정
-Comment[lt]=Čia galite konfigūruoti CDDB įrašų atsisiuntimą
+Comment[lt]=Konfigūruoti CDDB įrašų atsisiuntimą
Comment[lv]=Konfigurē CDDB datu saņemšanu
Comment[mk]=Конфигурирање на пребарувањето на CDDB
Comment[nb]=Oppsett av CDDB-henting
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/CMakeLists.txt new/kdemultimedia-4.0.85/libkcompactdisc/CMakeLists.txt
--- old/kdemultimedia-4.0.84/libkcompactdisc/CMakeLists.txt 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/libkcompactdisc/CMakeLists.txt 2008-07-03 07:06:31.000000000 +0200
@@ -32,11 +32,11 @@
wmlib/drv_toshiba.c
)
-if (APPLE OR MSVC)
+if (APPLE OR WIN32)
set(USE_WMLIB false)
-else (APPLE OR MSVC)
+else (APPLE OR WIN32)
set(USE_WMLIB true)
-endif (APPLE OR MSVC)
+endif (APPLE OR WIN32)
set(kcompactdisc_LIB_SRCS kcompactdisc.cpp kcompactdisc_p.cpp phonon_interface.cpp)
@@ -58,5 +58,5 @@
########### install files ###############
-install( FILES kcompactdisc.h DESTINATION ${INCLUDE_INSTALL_DIR}/libkcompactdisc)
+install( FILES kcompactdisc.h DESTINATION ${INCLUDE_INSTALL_DIR}/libkcompactdisc COMPONENT Devel)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/kcompactdisc.cpp new/kdemultimedia-4.0.85/libkcompactdisc/kcompactdisc.cpp
--- old/kdemultimedia-4.0.84/libkcompactdisc/kcompactdisc.cpp 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/libkcompactdisc/kcompactdisc.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -67,9 +67,9 @@
}
if(!device.vendor().isEmpty())
- name = (QString('[') + type + " - " + device.vendor() + " - " + device.product() + "]");
+ name = (QString('[') + type + " - " + device.vendor() + " - " + device.product() + ']');
else
- name = (QString('[') + type + " - unknown vendor - " + device.product() + "]");
+ name = (QString('[') + type + " - unknown vendor - " + device.product() + ']');
cdromsNameToDeviceUrl.insert(name, url);
cdromsNameToUdi.insert(name, device.udi());
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/kcompactdisc_p.cpp new/kdemultimedia-4.0.85/libkcompactdisc/kcompactdisc_p.cpp
--- old/kdemultimedia-4.0.84/libkcompactdisc/kcompactdisc_p.cpp 2008-04-10 11:31:01.000000000 +0200
+++ new/kdemultimedia-4.0.85/libkcompactdisc/kcompactdisc_p.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -18,13 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include
-#include
-
#include "kcompactdisc_p.h"
+
#include "wmlib_interface.h"
#include "phonon_interface.h"
+#include
+#include
+
KCompactDiscPrivate::KCompactDiscPrivate(KCompactDisc *p, const QString& dev) :
m_infoMode(KCompactDisc::Synchronous),
m_deviceName(dev),
@@ -32,7 +33,7 @@
m_status(KCompactDisc::NoDisc),
m_statusExpected(KCompactDisc::NoDisc),
m_discId(0),
- m_discLength(0),
+ m_discLength(0),
m_track(0),
m_tracks(0),
m_trackPosition(0),
@@ -43,13 +44,13 @@
m_randSequence(0),
m_loopPlaylist(false),
m_randomPlaylist(false),
- m_autoMetadata(true),
+ m_autoMetadata(true),
- m_deviceVendor(QString()),
+ m_deviceVendor(QString()),
m_deviceModel(QString()),
m_deviceRevision(QString()),
- q_ptr(p)
+ q_ptr(p)
{
m_interface = QString("dummy");
m_trackStartFrames.clear();
@@ -104,10 +105,10 @@
/* koz: 15/01/00. I want a random list that does not repeat tracks. Ie, */
/* a list is created in which each track is listed only once. The tracks */
/* are picked off one by one until the end of the list */
-
+
unsigned selected = 0, size = m_tracks;
bool rejected = false;
-
+
kDebug(67000) << "Playlist has " << size << " entries\n";
m_playlist.clear();
for(unsigned i = 0; i < size; i++) {
@@ -117,7 +118,7 @@
rejected = (m_playlist.indexOf(selected) != -1);
} while(rejected == true);
} else {
- selected = 1 + i;
+ selected = 1 + i;
}
m_playlist.append(selected);
}
@@ -139,7 +140,7 @@
min_index = 0;
max_index = m_playlist.size() - 1;
-
+
current_index = m_playlist.indexOf(m_track);
if(current_index < 0)
current_index = min_index;
@@ -205,7 +206,7 @@
}
}
}
-
+
emit q->discStatusChanged(status);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/phonon_interface.cpp new/kdemultimedia-4.0.85/libkcompactdisc/phonon_interface.cpp
--- old/kdemultimedia-4.0.84/libkcompactdisc/phonon_interface.cpp 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/phonon_interface.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -21,6 +21,8 @@
* CDDA version taken from guitest in phonon test directory
*/
+#include "phonon_interface.h"
+
#include
#include
@@ -34,8 +36,6 @@
#include
#include
-#include "phonon_interface.h"
-
#define WM_MSG_CLASS WM_MSG_CLASS_PLATFORM
using namespace Phonon;
@@ -115,7 +115,7 @@
return true;
}
- return false;
+ return false;
}
ProducerWidget *KPhononCompactDiscPrivate::producer()
@@ -123,7 +123,7 @@
//try to create
if(!m_producerWidget) {
Solid::Device opticalDevice(m_udi);
- Solid::OpticalDrive *opticalDrive = opticalDevice.asSolid::OpticalDrive();
+ Solid::OpticalDrive *opticalDrive = opticalDevice.asSolid::OpticalDrive();
if(opticalDrive) {
Solid::OpticalDisc *opticalDisc = opticalDevice.asSolid::OpticalDisc();
@@ -181,19 +181,19 @@
void KPhononCompactDiscPrivate::eject()
{
Solid::Device opticalDevice(m_udi);
- Solid::OpticalDrive *opticalDrive = opticalDevice.asSolid::OpticalDrive();
+ Solid::OpticalDrive *opticalDrive = opticalDevice.asSolid::OpticalDrive();
Solid::OpticalDisc *opticalDisc = opticalDevice.asSolid::OpticalDisc();
if(!opticalDrive || !opticalDisc)
return;
-
+
opticalDrive->eject();
}
void KPhononCompactDiscPrivate::closetray()
{
Solid::Device opticalDevice(m_udi);
- Solid::OpticalDrive *opticalDrive = opticalDevice.asSolid::OpticalDrive();
+ Solid::OpticalDrive *opticalDrive = opticalDevice.asSolid::OpticalDrive();
Solid::OpticalDisc *opticalDisc = opticalDevice.asSolid::OpticalDisc();
if(!opticalDrive || opticalDisc)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/audio/audio_alsa.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/audio/audio_alsa.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/audio/audio_alsa.c 2008-01-05 01:02:04.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/audio/audio_alsa.c 2008-07-03 07:06:31.000000000 +0200
@@ -112,7 +112,7 @@
return err;
}
if (new_rate != rate) {
- ERRORLOG("Rate doesn't match (requested %iHz, get %iHz)\n", rate, new_rate);
+ ERRORLOG("Rate does not match (requested %iHz, get %iHz)\n", rate, new_rate);
return -EINVAL;
}
/* set the buffer time */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/audio/audio_phonon.cpp new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/audio/audio_phonon.cpp
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/audio/audio_phonon.cpp 2008-01-05 01:02:04.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/audio/audio_phonon.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include "audio.h"
#include "audio_phonon.h"
+#include "audio.h"
#include <QByteArray>
#include <QDataStream>
@@ -173,7 +173,7 @@
DEBUGLOG("phonon_open\n");
if(PhononObject) {
- ERRORLOG("Allready initialized!\n");
+ ERRORLOG("Already initialized!\n");
return -1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/audio/audio_sun.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/audio/audio_sun.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/audio/audio_sun.c 2008-01-05 01:02:04.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/audio/audio_sun.c 2008-07-03 07:06:31.000000000 +0200
@@ -103,7 +103,7 @@
acdev = malloc(strlen(audiodev) + 4);
if (acdev == NULL)
{
- perror("Can't allocate audio control filename");
+ perror("Cannot allocate audio control filename");
exit(1);
}
strcpy(acdev, audiodev);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cdda.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cdda.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cdda.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cdda.c 2008-07-03 07:06:31.000000000 +0200
@@ -41,7 +41,7 @@
if we read 15 frames(8820 samples), we get in each block, data for 1/5 sec */
#define COUNT_CDDA_FRAMES_PER_BLOCK 15
-/* Only Linux and Sun define the number of blocks explicity; assume all
+/* Only Linux and Sun define the number of blocks explicitly; assume all
other systems are like Linux and have 10 blocks.
*/
#ifndef COUNT_CDDA_BLOCKS
@@ -250,7 +250,7 @@
}
i = 0;
- pthread_mutex_lock(&blks_mutex[i]);
+ (void) pthread_mutex_lock(&blks_mutex[i]);
wakeup = 1;
while(d->command == WM_CDM_PLAYING) {
@@ -265,20 +265,20 @@
}
j = get_next_block(i);
- pthread_mutex_lock(&blks_mutex[j]);
+ (void) pthread_mutex_lock(&blks_mutex[j]);
if(wakeup) {
wakeup = 0;
pthread_cond_signal(&wakeup_audio);
}
- pthread_mutex_unlock(&blks_mutex[i]);
+ (void) pthread_mutex_unlock(&blks_mutex[i]);
/* audio can start here */
i = j;
}
- pthread_mutex_unlock(&blks_mutex[i]);
+ (void) pthread_mutex_unlock(&blks_mutex[i]);
}
return 0;
@@ -292,11 +292,11 @@
while (d->blocks) {
if(d->command != WM_CDM_PLAYING) {
i = 0;
- pthread_mutex_lock(&blks_mutex[i]);
+ (void) pthread_mutex_lock(&blks_mutex[i]);
pthread_cond_wait(&wakeup_audio, &blks_mutex[i]);
} else {
i = get_next_block(i);
- pthread_mutex_lock(&blks_mutex[i]);
+ (void) pthread_mutex_lock(&blks_mutex[i]);
}
if (oops->wmaudio_play(&blks[i])) {
@@ -313,7 +313,7 @@
if ((d->status = blks[i].status) == WM_CDM_TRACK_DONE)
d->command = WM_CDM_STOPPED;
- pthread_mutex_unlock(&blks_mutex[i]);
+ (void) pthread_mutex_unlock(&blks_mutex[i]);
}
return 0;
@@ -325,17 +325,17 @@
int wm_cdda_init(struct wm_drive *d)
{
int ret = 0;
-
+
if (d->cddax) {
wm_cdda_destroy(d);
-
+
wm_susleep(1000);
d->blocks = 0;
wm_susleep(1000);
}
-
+
memset(blks, 0, sizeof(blks));
-
+
d->blocks = blks;
d->frames_at_once = COUNT_CDDA_FRAMES_PER_BLOCK;
d->numblocks = COUNT_CDDA_BLOCKS;
@@ -348,14 +348,14 @@
return ret;
wm_scsi_set_speed(d, 4);
-
+
oops = setup_soundsystem(d->soundsystem, d->sounddevice, d->ctldevice);
if (!oops) {
ERRORLOG("cdda: setup_soundsystem failed\n");
gen_cdda_close(d);
return -1;
}
-
+
if(pthread_create(&thread_read, NULL, cdda_fct_read, d)) {
ERRORLOG("error by create pthread");
oops->wmaudio_close();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cddb.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cddb.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cddb.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cddb.c 2008-07-03 07:06:31.000000000 +0200
@@ -1,9 +1,8 @@
/*
* This file is part of WorkMan, the civilized CD player library
* Copyright (C) 1991-1997 by Steven Grimm (original author)
- * Copyright (C) by Dirk Försterling (current 'author' = maintainer)
- * The maintainer can be contacted by his e-mail address:
- *
+ * Copyright (C) by Dirk Försterling
+ * Copyright (C) 2004-2006 Alexander Kern
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cdrom.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cdrom.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cdrom.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cdrom.c 2008-07-03 07:06:31.000000000 +0200
@@ -1,9 +1,8 @@
/*
* This file is part of WorkMan, the civilized CD player library
* Copyright (C) 1991-1997 by Steven Grimm (original author)
- * Copyright (C) by Dirk Försterling (current 'author' = maintainer)
- * The maintainer can be contacted by his e-mail address:
- *
+ * Copyright (C) by Dirk Försterling
+ * Copyright (C) 2004-2006 Alexander Kern
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -132,7 +131,10 @@
pdrive->soundsystem = soundsystem ? strdup(soundsystem): NULL;
pdrive->sounddevice = sounddevice ? strdup(sounddevice) : NULL;
pdrive->ctldevice = ctldevice ? strdup(ctldevice) : NULL;
-
+ if(!pdrive->cd_device) {
+ err = -ENOMEM;
+ goto init_failed;
+ }
pdrive->fd = -1;
pdrive->proto.open = gen_open;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cdtext.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cdtext.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/cdtext.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/cdtext.c 2008-07-03 07:06:31.000000000 +0200
@@ -205,7 +205,7 @@
}
#else
else {
- wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode");
+ wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "cannot handle unicode");
}
#endif
}
@@ -305,7 +305,7 @@
if(0 == lp_block)
{
wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS,
- "CDTEXT ERROR: out of memory, can't create a new language block\n");
+ "CDTEXT ERROR: out of memory, cannot create a new language block\n");
free_cdtext_info(&wm_cdtext_info);
return NULL /*ENOMEM*/;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/drv_sony.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/drv_sony.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/drv_sony.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/drv_sony.c 2008-07-03 07:06:31.000000000 +0200
@@ -1,9 +1,8 @@
/*
* This file is part of WorkMan, the civilized CD player library
* Copyright (C) 1991-1997 by Steven Grimm (original author)
- * Copyright (C) by Dirk Försterling (current 'author' = maintainer)
- * The maintainer can be contacted by his e-mail address:
- *
+ * Copyright (C) by Dirk Försterling
+ * Copyright (C) 2004-2006 Alexander Kern
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/drv_toshiba.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/drv_toshiba.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/drv_toshiba.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/drv_toshiba.c 2008-07-03 07:06:31.000000000 +0200
@@ -1,9 +1,8 @@
/*
* This file is part of WorkMan, the civilized CD player library
* Copyright (C) 1991-1997 by Steven Grimm (original author)
- * Copyright (C) by Dirk Försterling (current 'author' = maintainer)
- * The maintainer can be contacted by his e-mail address:
- *
+ * Copyright (C) by Dirk Försterling
+ * Copyright (C) 2004-2006 Alexander Kern
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/include/wm_cdinfo.h new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/include/wm_cdinfo.h
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/include/wm_cdinfo.h 2008-01-05 01:02:04.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/include/wm_cdinfo.h 2008-07-03 07:06:31.000000000 +0200
@@ -5,9 +5,8 @@
*
* This file is part of WorkMan, the civilized CD player library
* Copyright (C) 1991-1997 by Steven Grimm (original author)
- * Copyright (C) by Dirk Försterling (current 'author' = maintainer)
- * The maintainer can be contacted by his e-mail address:
- *
+ * Copyright (C) by Dirk Försterling
+ * Copyright (C) 2004-2006 Alexander Kern
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_linux.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_linux.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_linux.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_linux.c 2008-07-03 07:06:31.000000000 +0200
@@ -109,7 +109,7 @@
int gen_init(struct wm_drive *d)
{
return 0;
-}
+}
int gen_open(struct wm_drive *d)
{
@@ -158,7 +158,7 @@
ret = d->proto.open(d);
if(ret < 0) /* error */
return ret;
-
+
if(ret == 1) {
/* retry */
*mode = WM_CDM_UNKNOWN;
@@ -170,11 +170,11 @@
/* Don't care about return value. If it */
/* works - fine. If not - ... */
ioctl(d->fd, CDROM_LOCKDOOR, 0);
-
+
*mode = WM_CDM_UNKNOWN;
-
+
sc.cdsc_format = CDROM_MSF;
-
+
if(!ioctl(d->fd, CDROMSUBCHNL, &sc)) {
switch (sc.cdsc_audiostatus) {
case CDROM_AUDIO_PLAY:
@@ -206,15 +206,15 @@
} else
*mode = WM_CDM_STOPPED;
break;
-
+
case CDROM_AUDIO_NO_STATUS:
*mode = WM_CDM_STOPPED;
break;
-
+
case CDROM_AUDIO_COMPLETED:
*mode = WM_CDM_TRACK_DONE; /* waiting for next track. */
break;
-
+
case CDROM_AUDIO_INVALID: /**/
default:
*mode = WM_CDM_UNKNOWN;
@@ -360,7 +360,7 @@
#endif
wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "ejecting?\n");
-
+
if(fstat(d->fd, &stbuf) != 0) {
wm_lib_message(WM_MSG_LEVEL_ERROR|WM_MSG_CLASS, "that weird fstat() thingy\n");
return -2;
@@ -473,7 +473,7 @@
int gen_set_volume(struct wm_drive *d, int left, int right)
{
struct cdrom_volctrl v;
-
+
v.channel0 = v.channel2 = left < 0 ? 0 : left > 255 ? 255 : left;
v.channel1 = v.channel3 = right < 0 ? 0 : right > 255 ? 255 : right;
@@ -577,26 +577,26 @@
int capability;
wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS, "wm_scsi over CDROM_SEND_PACKET entered\n");
-
+
capability = ioctl(d->fd, CDROM_GET_CAPABILITY);
-
+
if(!(capability & CDC_GENERIC_PACKET)) {
wm_lib_message(WM_MSG_LEVEL_DEBUG|WM_MSG_CLASS,
- "your CDROM or/and kernel don't support CDC_GENERIC_PACKET ...\n");
+ "your CDROM or/and kernel does not support CDC_GENERIC_PACKET ...\n");
return -1;
}
memset(&cdc, 0, sizeof(struct cdrom_generic_command));
memset(&sense, 0, sizeof(struct request_sense));
-
+
memcpy(cdc.cmd, cdb, cdblen);
-
+
cdc.buffer = retbuf;
cdc.buflen = retbuflen;
cdc.stat = 0;
cdc.sense = &sense;
cdc.data_direction = getreply?CGC_DATA_READ:CGC_DATA_WRITE;
-
+
/* sendpacket_over_cdrom_interface() */
if((ret = ioctl(d->fd, CDROM_SEND_PACKET, &cdc)))
wm_lib_message(WM_MSG_LEVEL_ERROR|WM_MSG_CLASS,
@@ -666,7 +666,7 @@
cdda.addr.lba = 200;
cdda.nframes = 1;
cdda.buf = (unsigned char *)d->blocks[0].buf;
-
+
d->status = WM_CDM_STOPPED;
if((ioctl(d->fd, CDROMREADAUDIO, &cdda) < 0)) {
if (errno == ENXIO) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_openbsd.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_openbsd.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_openbsd.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_openbsd.c 2008-07-03 07:06:31.000000000 +0200
@@ -75,7 +75,7 @@
} else if (access("/dev/acd0c", F_OK) == 0) {
return "/dev/acd0c";
} else {
- fprintf(stderr, "Couldn't find a CD device!\n");
+ fprintf(stderr, "Could not find a CD device!\n");
return NULL;
}
} /* find_cdrom() */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_sun.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_sun.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_sun.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_sun.c 2008-07-03 07:06:31.000000000 +0200
@@ -158,7 +158,7 @@
return "/dev/rsr0";
else
{
- fprintf(stderr, "Couldn't find a CD device!\n");
+ fprintf(stderr, "Could not find a CD device!\n");
return NULL;
}
} /* find_cdrom() */
@@ -639,7 +639,7 @@
cdda.cdda_length = 1;
cdda.cdda_data = d->blocks[0].buf;
cdda.cdda_subcode = CDROM_DA_SUBQ;
-
+
d->status = WM_CDM_STOPPED;
if((ioctl(d->fd, CDROMCDDA, &cdda) < 0)) {
return -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_svr4.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_svr4.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/plat_svr4.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/plat_svr4.c 2008-07-03 07:06:31.000000000 +0200
@@ -147,7 +147,7 @@
}
else
{
- fprintf(stderr, "Couldn't find a CD device!\n");
+ fprintf(stderr, "Could not find a CD device!\n");
return NULL;
}
} /* find_cdrom() */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/scsi.c new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/scsi.c
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib/scsi.c 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib/scsi.c 2008-07-03 07:06:31.000000000 +0200
@@ -543,7 +543,7 @@
#else
cdtext_possible = 1;
wm_lib_message(WM_MSG_LEVEL_INFO|WM_MSG_CLASS,
- "CDTEXT INFO: GET_FEATURY_LIST(0x46) ignored. It's OK, because many CDROMS don't implement this feature\n");
+ "CDTEXT INFO: GET_FEATURY_LIST(0x46) ignored. It is OK, because many CDROMS do not implement this feature\n");
#endif /* IGNORE_FEATURE_LIST */
} else {
feature_list_length = temp[0]*0xFFFFFF + temp[1]*0xFFFF + temp[2]*0xFF + temp[3] + 4;
@@ -635,7 +635,7 @@
wm_scsi_set_speed(struct wm_drive *d, int read_speed)
{
int ret;
-
+
ret = sendscsi(d, NULL, 0, 0,
SCMD_SET_CD_SPEED, 0x00, (read_speed>>8) & 0xFF, read_speed & 0xFF, 0xFF, 0xFF,
0, 0, 0, 0, 0, 0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/libkcompactdisc/wmlib_interface.cpp new/kdemultimedia-4.0.85/libkcompactdisc/wmlib_interface.cpp
--- old/kdemultimedia-4.0.84/libkcompactdisc/wmlib_interface.cpp 2008-01-05 01:02:05.000000000 +0100
+++ new/kdemultimedia-4.0.85/libkcompactdisc/wmlib_interface.cpp 2008-07-03 07:06:31.000000000 +0200
@@ -18,11 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "wmlib_interface.h"
+
#include
#include
-#include "wmlib_interface.h"
-
extern "C"
{
// We don't have libWorkMan installed already, so get everything
@@ -54,7 +54,7 @@
QString devicePath;
devicePath = KCompactDisc::cdromDeviceUrl(m_deviceName).path();
-
+
// Debug.
//wm_cd_set_verbosity(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS_ALL);
@@ -78,7 +78,7 @@
} else {
QTimer::singleShot(1000, this, SLOT(timerExpired()));
}
-
+
return true;
}
return false;
@@ -97,11 +97,11 @@
void KWMLibCompactDiscPrivate::playTrackPosition(unsigned track, unsigned position)
{
unsigned firstTrack, lastTrack;
-
+
firstTrack = TRACK_VALID(track) ? track : 1;
lastTrack = firstTrack + 1;
lastTrack = TRACK_VALID(lastTrack) ? lastTrack : WM_ENDTRACK;
-
+
kDebug() << "play track " << firstTrack << " position "
<< position << endl;
@@ -159,7 +159,7 @@
{
int bal = wm_cd_getbalance(m_handle);
unsigned balance = RANGE2PERCENT(bal, WM_BALANCE_ALL_LEFTS, WM_BALANCE_ALL_RIGHTS);
-
+
return balance;
}
@@ -219,7 +219,7 @@
if(m_tracks > 0) {
kDebug() << "New disc with " << m_tracks << " tracks";
m_discId = wm_cddb_discid(m_handle);
-
+
for(i = 1; i <= m_tracks; i++) {
m_trackStartFrames.append(wm_cd_gettrackstart(m_handle, i));
}
@@ -272,7 +272,7 @@
// Per-event processing.
track = wm_cd_getcurtrack(m_handle);
-
+
if(m_track != track) {
m_track = track;
emit q->playoutTrackChanged(m_track);
@@ -300,7 +300,7 @@
Q_Q(KCompactDisc);
info = wm_cd_get_cdtext(m_handle);
-
+
if(!info || !info->valid || (unsigned)info->count_of_entries != (m_tracks + 1)) {
kDebug() << "no or invalid CDTEXT";
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/avi/kfile_avi.desktop new/kdemultimedia-4.0.85/strigi-analyzer/avi/kfile_avi.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/avi/kfile_avi.desktop 2008-06-03 11:34:55.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/avi/kfile_avi.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=AVI Info
Name[af]=Avi Inligting
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/flac/kfile_flac.desktop new/kdemultimedia-4.0.85/strigi-analyzer/flac/kfile_flac.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/flac/kfile_flac.desktop 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/flac/kfile_flac.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=FLAC Info
Name[bg]=Информация за FLAC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/mp3/kfile_mp3.desktop new/kdemultimedia-4.0.85/strigi-analyzer/mp3/kfile_mp3.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/mp3/kfile_mp3.desktop 2008-06-03 11:34:55.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/mp3/kfile_mp3.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=MP3 Info
Name[af]=Mp3 Inligting
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/mpc/kfile_mpc.desktop new/kdemultimedia-4.0.85/strigi-analyzer/mpc/kfile_mpc.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/mpc/kfile_mpc.desktop 2008-06-03 11:34:55.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/mpc/kfile_mpc.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=Musepack Info
Name[bg]=Информация за Musepack
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/ogg/kfile_ogg.desktop new/kdemultimedia-4.0.85/strigi-analyzer/ogg/kfile_ogg.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/ogg/kfile_ogg.desktop 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/ogg/kfile_ogg.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=OGG Info
Name[af]=Ogg Inligting
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/sid/kfile_sid.desktop new/kdemultimedia-4.0.85/strigi-analyzer/sid/kfile_sid.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/sid/kfile_sid.desktop 2008-06-03 11:34:56.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/sid/kfile_sid.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=SID Info
Name[bg]=Информация за SID
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/theora/kfile_theora.desktop new/kdemultimedia-4.0.85/strigi-analyzer/theora/kfile_theora.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/theora/kfile_theora.desktop 2008-06-03 11:34:56.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/theora/kfile_theora.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=theora Info
Name[bg]=Информация за theora
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdemultimedia-4.0.84/strigi-analyzer/wav/kfile_wav.desktop new/kdemultimedia-4.0.85/strigi-analyzer/wav/kfile_wav.desktop
--- old/kdemultimedia-4.0.84/strigi-analyzer/wav/kfile_wav.desktop 2008-06-03 11:34:57.000000000 +0200
+++ new/kdemultimedia-4.0.85/strigi-analyzer/wav/kfile_wav.desktop 2008-07-03 07:06:31.000000000 +0200
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Service
Name=WAV Info
Name[af]=Wav Inligting
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org