pool/kaffeine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=18

Browse Source
This commit is contained in:
OBS User unknown 2009-04-29 00:11:25 +00:00 committed by Git OBS Bridge
parent ff824bfcd2
commit ca87a967d2
19 changed files with 64 additions and 2576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -21,5 +21,3 @@
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
logo.ogg filter=lfs diff=lfs merge=lfs -text

24
adjust-mimetypes.diff
View File

@ -1,24 +0,0 @@
--- kaffeine/src/kaffeine.desktop
+++ kaffeine/src/kaffeine.desktop
@@ -47,7 +47,8 @@ GenericName[xx]=xxMedia Playerxx
GenericName[zh_CN]=媒体播放器
GenericName[zh_TW]=媒體播放程式
Icon=kaffeine
-MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;audio/x-mod;audio/x-stm;
+# removed on SUSE: audio/vnd.rn-realaudio; audio/x-pn-realaudio;audio/x-pn-realaudio-plugin; video/vnd.rn-realvideo;
+MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;audio/x-mod;audio/x-stm;
Name=Kaffeine
Name[bn]=ক্যাফিন
Name[pa]=ਕੈਫ਼ੀਨ
--- kaffeine/src/player-parts/xine-part/xine_part.desktop
+++ kaffeine/src/player-parts/xine-part/xine_part.desktop
@@ -1,7 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Icon=kaffeine
-MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;
+#removed on SUSE: audio/vnd.rn-realaudio; audio/x-pn-realaudio;audio/x-pn-realaudio-plugin; video/vnd.rn-realvideo;
+MimeType=application/x-ogg;audio/basic;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-asf-plugin;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;
Name=Kaffeine-Xine
Name[nb]=Kaffeine Xine
Name[pa]=ਕੈਫੀਨ-ਜ਼ਾਇਨ

2129
cs.po
View File

File diff suppressed because it is too large Load Diff

10
desktop-files.diff Normal file
View File

@ -0,0 +1,10 @@
--- src/kaffeine.desktop 2009/04/28 06:18:54 1.1
+++ src/kaffeine.desktop 2009/04/28 06:23:47
@@ -45,7 +45,6 @@
GenericName[x-test]=xxMedia Playerxx
GenericName[zh_CN]=媒体播放器
Categories=Qt;KDE;AudioVideo;Player;
-Icon=kaffeine
MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-mplayer2;application/x-quicktime-media-link;application/x-shorten;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg;
Terminal=false
Type=Application

17
dvbaudio-fix-build.patch
View File

@ -1,17 +0,0 @@
Subject: Fix build due to uint16_t
From: Lubos Lunak
Patch-upstream: no
Build fails with
/usr/include/linux/dvb/audio.h:79: error: expected '=’, ',’, ';’, 'asm’ or '__attribute__’ before 'audio_attributes_t’
Since it's a kernel header, it should be rather the kernel uint16_t then the stdint.h one, but they should be the same anyway :).
--- kaffeine/src/input/dvb/lib/libdvbapi/dvbaudio.c.sav 2008-07-01 15:35:02.000000000 +0200
+++ kaffeine/src/input/dvb/lib/libdvbapi/dvbaudio.c 2009-04-08 17:47:35.000000000 +0200
@@ -25,6 +25,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
+#include <stdint.h>
#include <linux/dvb/audio.h>
#include <errno.h>
#include "dvbaudio.h"

3
dvbdata.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f722920c73a2409faa9e7f69d44f57d210ae4bf95c85204fd654fc3f4bcce613
size 45628

3
kaffeine-0.8.7.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb65306f04138a990b2a66a3709e3038e7eb7e3254af09f21a4e7075ec949e1d
size 2973819

11
kaffeine-link.diff
View File

@ -1,11 +0,0 @@
--- kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am.orig 2008-04-30 07:55:58.000000000 +0200
+++ kaffeine/src/input/disc/plugins/oggvorbis/Makefile.am 2008-04-30 08:02:54.000000000 +0200
@@ -9,7 +9,7 @@ kaffeineincludedir = $(includedir)/kaffe
noinst_HEADERS = koggenc.h
libkaffeineoggvorbis_la_SOURCES = koggenc.cpp oggconfig.ui
-libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS)
+libkaffeineoggvorbis_la_LIBADD = ../libkaffeineaudioencoder.la $(LIB_OGGVORBIS) -lvorbis -logg
libkaffeineoggvorbis_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -avoid-version -no-undefined
# this is where the desktop file will go

76
kaffeine-media.diff
View File

@ -1,76 +0,0 @@
Index: kaffeine/kaffeineapp.cpp
===================================================================
--- kaffeine/src/kaffeineapp.cpp.orig
+++ kaffeine/src/kaffeineapp.cpp
@@ -61,19 +62,42 @@ int KaffeineApp::newInstance()
if (args->count())
for (int i = 0; i < args->count(); i++ )
{
- url = QFile::decodeName(args->arg(i));
- // relative file names
- if ((url.left(1) != "/") && (!url.contains(":/")) && (url.lower() != "dvd") && (url.lower() != "vcd")
- && (url.lower() != "audiocd") && (url.lower() != "cdda"))
- url = path.absFilePath(url);
+ KURL u = KIO::NetAccess::mostLocalURL(args->url(i), 0);
+ if (u.isLocalFile())
+ url = path.absFilePath(u.path());
+ else
+ url = u.url();
urls.append(url);
}
+ QString device = args->getOption("device");
+ if (device == "default")
+ device = QString::null;
+ else if (device.startsWith("media:/") || device.startsWith("system:/media/"))
+ {
+ if (device.startsWith("system:/media/"))
+ {
+ device = device.mid(14);
+ device = device.prepend("media:/");
+ }
+ KURL devicePath(device);
+ DCOPRef mediamanager("kded","mediamanager");
+ DCOPReply reply = mediamanager.call("properties(QString)",devicePath.path(-1).mid(1));
+ if (reply.isValid())
+ {
+ QStringList properties = reply;
+ device = properties[5];
+ }
+ else
+ device = QString::null;
+ }
+
if (m_kaffeine) /* still running */
{
kdDebug() << "KaffeineApp: Kaffeine is still running..." << endl;
if (urls.count() > 0) /* send urls to running instance */
{
+ m_kaffeine->setDevice(device);
m_kaffeine->loadTMP(urls);
QTimer::singleShot(300, m_kaffeine, SLOT(slotSwitchToPlayerWindow())); // delay for feeling only
}
@@ -92,23 +116,6 @@ int KaffeineApp::newInstance()
if (args->isSet("verbose"))
engineParameters.append("verbose=\"True\"");
- QString device = args->getOption("device");
- if (device == "default")
- device = QString::null;
- else if (device.startsWith("media:/"))
- {
- KURL devicePath(device);
- DCOPRef mediamanager("kded","mediamanager");
- DCOPReply reply = mediamanager.call("properties(QString)",devicePath.path(-1).mid(1));
- if (reply.isValid())
- {
- QStringList properties = reply;
- device = properties[5];
- }
- else
- device = QString::null;
- }
-
m_kaffeine = new Kaffeine(urls, engineParameters, device, args->isSet("play"), args->isSet("fullscreen"),
args->isSet("wizard"), 0, "kaffeine_mainview");
m_kaffeine->show();

30
kaffeine-quote-subs.patch
View File

@ -1,30 +0,0 @@
--- kaffeine/src/input/audiobrowser/playlist.cpp
+++ kaffeine/src/input/audiobrowser/playlist.cpp
@@ -1895,7 +1895,12 @@
{
QString subList;
for(unsigned int i=0; i<tmp->subtitles().count(); i++)
- subList += tmp->subtitles()[i] + "&";
+ {
+ QString sub = tmp->subtitles()[i];
+ sub.replace('%', "%25");
+ sub.replace('&', "%26");
+ subList += sub + "&";
+ }
entry.setAttribute("subs", subList);
}
--- kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
+++ kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
@@ -69,7 +69,11 @@
int currentSub = -1;
if ((!att.value("subs").isNull()) && (!att.value("subs").isEmpty()))
+ {
subs = QStringList::split("&",att.value("subs"),false);
+ subs.gres("%26", "&");
+ subs.gres("%25", "%");
+ }
if ((!att.value("subs").isNull()) && (!att.value("subs").isEmpty()))
{
bool ok;

12
kaffeine-tmpobject.diff
View File

@ -1,12 +0,0 @@
--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -2970,7 +2970,8 @@ void KXineWidget::setStreamSaveDir(const
if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */
debugOut(QString("Set misc.save_dir to: %1").arg(dir));
- config.str_value = QFile::encodeName(dir).data();
+ QCString edir = QFile::encodeName(dir);
+ config.str_value = edir.data();
xine_config_update_entry (m_xineEngine, &config);
}

11
kaffeine.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Apr 28 08:32:10 CEST 2009 - beineri@opensuse.org
- fix build
-------------------------------------------------------------------
Mon Apr 27 20:55:01 CEST 2009 - tittiatcoke@gmail.com
- update to 1.0-pre1; This is the pre-release of the KDE4 version
and is not really intended yet for end-users
-------------------------------------------------------------------
Wed Apr 8 18:06:14 CEST 2009 - llunak@suse.cz

59
kaffeine.diff
View File

@ -1,59 +0,0 @@
--- kaffeine/src/kaffeine.desktop
+++ kaffeine/src/kaffeine.desktop 2005/09/06 09:01:52
@@ -19,3 +19,4 @@
Terminal=false
Type=Application
X-KDE-HasTempFileOption=true
+InitialPreference=4
--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2007/04/14 05:59:48 1.1
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp 2007/04/14 06:01:37
@@ -1080,7 +1080,8 @@
/**** INIT XINE DISPLAY ****/
#ifndef HAVE_XCB
- XInitThreads();
+ // too late, it will crash for sure
+ // XInitThreads();
connection = XOpenDisplay(NULL);
#else
--- kaffeine/src/instwizard.cpp
+++ kaffeine/src/instwizard.cpp 2005/09/06 09:01:52
@@ -106,8 +106,7 @@
if (entries.count())
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
else
- info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats. Download the codecs here:")
- << " <a href=\"http://www1.mplayerhq.hu/homepage/design7/codecs.html\">http://www.mplayerhq.hu</a>.</font>";
+ info << "<font color=\"DarkRed\">" << i18n("No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats.");
//LIBDVDCSS
info << "<br><hr><b>" << "libdvdcss" << "...</b><br>";
@@ -131,8 +130,7 @@
}
}
if (!dvdcss)
- info << "<font color=\"DarkRed\">" << i18n("libdvdcss not found. You're not able to play encrypted (most commercial) DVD's. You can get the library here (but using it may violate copyright regulations of your country!):")
- << " <a href=\"http://developers.videolan.org/libdvdcss/\">http://developers.videolan.org/libdvdcss</a>.</font>";
+ info << "<font color=\"DarkRed\">" << i18n("libdvdcss not found. You're not able to play encrypted (most commercial) DVD's.");
else
info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
@@ -172,8 +170,7 @@
file.open(IO_ReadOnly);
QTextStream stream(&file);
info << "<font color=\"DarkBlue\">" << i18n("Found") << ": " << stream.readLine() << ". </font>"
- << i18n("The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\". You should use the packages from here:")
- << " <a href=\"http://packman.links2linux.de/?action=124\">http://packman.links2linux.de</a>.";
+ << i18n("The xine-lib shipped by SuSE \"may lack certain features because of legal requirements (potential patent violation)\".");
file.close();
}
else
--- configure.in.in.orig 2006-11-25 13:52:25.000000000 +0100
+++ configure.in.in 2006-11-25 13:52:42.000000000 +0100
@@ -1,4 +1,5 @@
#MIN_CONFIG(3.3)
+AM_INIT_AUTOMAKE(kaffeine, "0.8.2")
CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
if test "$build_arts" = "yes"; then

151
kaffeine.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package kaffeine (Version 0.8.7)
# spec file for package kaffeine (Version 0.9+1.0pre1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,40 +19,20 @@
Name: kaffeine
BuildRequires: cdparanoia kdelibs3-devel xine-devel xine-lib
%if %suse_version > 1001
BuildRequires: gstreamer010-plugins-base-devel
%else
BuildRequires: gstreamer-plugins-devel
%endif
BuildRequires: libkdepimlibs4-devel
Url: http://kaffeine.sourceforge.net/
License: GPL v2 or later
Group: Productivity/Multimedia/Video/Players
Summary: Xine-Based Multimedia Player
Version: 0.8.7
Release: 47
%define rversion %version
Version: 0.9+1.0pre1
Release: 1
# http://kaffeine.kde.org/?q=node/22
Source0: kaffeine.tar.bz2
Patch: desktop-files.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
%if %suse_version > 1020
Requires: %{name}-lang = %{version}
%endif
Provides: kaxtv
Obsoletes: kaxtv
Source0: %name-%rversion.tar.bz2
Source4: logo.ogg
Source5: cs.po
Source6: dvbdata.tar.gz
Patch0: %name.diff
Patch1: adjust-mimetypes.diff
Patch2: messagebox-dvd.diff
Patch4: mutex.diff
Patch5: kaffeine-media.diff
Patch6: kaffeine-link.diff
Patch8: kaffeine-quote-subs.patch
Patch9: pedantic.diff
Patch10: kaffeine-tmpobject.diff
Patch11: dvbaudio-fix-build.patch
%kde4_runtime_requires
Provides: kde4-kaffeine = 4.2.2.svn951439
Obsoletes: kde4-kaffeine <= 4.2.2.svn951439
%description
Kaffeine plays all files and devices supported by Xine. For example,
@ -65,100 +45,49 @@ Authors:
--------
Jürgen Kofler <kaffeine@gmx.net>
%package gstreamer
License: GPL v2 or later
Group: Productivity/Multimedia/Video/Players
Summary: Multimedia Player using Gstreamer
%description gstreamer
This plugin enables Kaffeine to play via the Gstreamer framework
instead of Xine.
The gstreamer backend can only get used for the visualization of audio
sources.
Authors:
--------
Jürgen Kofler <kaffeine@gmx.net>
%lang_package
%prep
%setup -q -n %name-%rversion
%setup -q -n kaffeine
%patch
%patch1
%patch2
%patch4
#%patch5
%patch6
%patch8
%patch9
%patch10
%patch11
cp %SOURCE5 po/
. /etc/opt/kde3/common_options
update_admin
%build
. /etc/opt/kde3/common_options
./configure $configkde --disable-final
make %{?jobs:-j%jobs}
cp %{SOURCE6} images
%cmake_kde4 -d build
%make_jobs
%install
. /etc/opt/kde3/common_options
make DESTDIR=${RPM_BUILD_ROOT} $INSTALL_TARGET
#
install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/opt/kde3/share/apps/kaffeine/logo.avi
# -r to get rid of Music
%suse_update_desktop_file -r kaffeine KDE AudioVideo Player Video
rm -rf $RPM_BUILD_ROOT/opt/kde3/share/locale/xx
rm $RPM_BUILD_ROOT/opt/kde3/share/mimelnk/application/x-mplayer2.desktop
kde_post_install
%find_lang %name
pushd build
%makeinstall
popd
rm -rf $RPM_BUILD_ROOT/usr/share/locale/x-test
%suse_update_desktop_file kaffeine KDE AudioVideo Player Video
%kde_post_install
%find_lang kaffeine
%post
%run_ldconfig
%post -p /sbin/ldconfig
%postun
%run_ldconfig
%if %suse_version > 1020
%postun -p /sbin/ldconfig
%files lang -f %name.lang
%clean
rm -rf $RPM_BUILD_ROOT
%files
%else
%files -f %name.lang
%endif
%files -f kaffeine.lang
%defattr(-,root,root)
/opt/kde3/bin/*
/opt/kde3/include/kaffeine
/opt/kde3/%_lib/lib*
/opt/kde3/%_lib/kde3/libxinepart.*
/opt/kde3/%_lib/kde3/libkaffeineoggvorbis.*
/opt/kde3/share/appl*/*/*
/opt/kde3/share/apps/kaffeine
/opt/kde3/share/apps/konqueror
/opt/kde3/share/apps/profiles
/opt/kde3/share/icons/*
/opt/kde3/share/mimelnk/*/*.desktop
/opt/kde3/share/services/xine_part.desktop
/opt/kde3/share/services/kaffeineoggvorbis.desktop
/opt/kde3/share/servicetypes/kaffeineaudioencoder.desktop
/opt/kde3/share/servicetypes/kaffeinedvbplugin.desktop
/opt/kde3/share/servicetypes/kaffeineepgplugin.desktop
%files gstreamer
%defattr(-,root,root)
%if %suse_version > 1000
/opt/kde3/%_lib/kde3/libgstreamerpart.*
/opt/kde3/share/apps/gstreamerpart
/opt/kde3/share/services/gstreamer_part.desktop
%endif
/usr/bin/kaffeine
%_kde_share_dir/apps/kaffeine
/usr/share/applications/kde4/kaffeine.desktop
%dir %_kde_share_dir/apps/solid
%dir %_kde_share_dir/apps/solid/actions
%_kde_share_dir/apps/solid/actions/kaffeine_play_audiocd.desktop
%_kde_share_dir/apps/solid/actions/kaffeine_play_dvd.desktop
%_kde_share_dir/apps/solid/actions/kaffeine_play_videocd.desktop
/usr/share/icons/oxygen/*/actions/audio-radio-encrypted.*
/usr/share/icons/oxygen/*/actions/video-television-encrypted.*
%changelog
* Tue Apr 28 2009 beineri@opensuse.org
- fix build
* Mon Apr 27 2009 tittiatcoke@gmail.com
- update to 1.0-pre1; This is the pre-release of the KDE4 version
and is not really intended yet for end-users
* Wed Apr 08 2009 llunak@suse.cz
- fix build due to uint16_t
* Mon Jul 07 2008 dmueller@suse.de

3
kaffeine.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e20250e6a73a61d4b5ac31bf2f525fbc796a004b5aa4aec1e61966734d66309
size 191705

3
logo.ogg
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5f74c2240c97c81f52be560a8555c1633f5165266e065cc27ec859e38f02ce0
size 117033

24
messagebox-dvd.diff
View File

@ -1,24 +0,0 @@
--- kaffeine/src/input/disc/disc.cpp 2006/03/28 11:51:04 1.1
+++ kaffeine/src/input/disc/disc.cpp 2006/03/28 11:57:23
@@ -583,6 +583,12 @@
if ( !device.isEmpty() )
mrl.setURL( QString("dvd://%1").arg(device) );
else {
+
+ if ( !QFile::exists("/usr/share/xine/mad") && QFile::exists("/usr/share/doc/packages/xine/README.SuSE") ) {
+ KMessageBox::sorry(0, i18n("This version of Xine (used by Kaffeine) has only a reduced\nset of supported codecs. It is not able to play DVDs.\nRead http://en.opensuse.org/XINE for further details."), QString::null, KMessageBox::AllowLink);
+ return;
+ }
+
DCOPRef mediamanager("kded","mediamanager");
DCOPReply reply = mediamanager.call("fullList()");
if ( reply.isValid() ) {
--- po/de.po 2006/12/05 09:33:47 1.15
+++ po/de.po 2006/12/05 09:34:21
@@ -3210,2 +3210,6 @@
msgid "DummyPart"
msgstr "DummyPart"
+
+msgid "This version of Xine (used by Kaffeine) has only a reduced\nset of supported codecs. It is not able to play DVDs.\nPlease read http://en.opensuse.org/XINE for further details."
+msgstr "Diese Version von Xine (wird von Kaffeine benutzt) hat nur\neine limitierte Anzahl von Codecs. Daher ist es nicht möglich eine DVD anzusehen.\nBitte lesen Sie diese Seite http://en.opensuse.org/XINE für weitere Informationen."
+

62
mutex.diff
View File

@ -1,62 +0,0 @@
--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -380,12 +380,13 @@
{
debugOut("xine event: channels changed");
int i,channels;
- char* lang = new char[128];
+ char lang[128];
QString slang;
int num;
QStringList tmp;
bool update=false, sk;
+ vw->m_mutex.lock();
/*** get audio channels ***/
tmp.append(i18n("auto"));
channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
@@ -433,8 +434,6 @@
vw->m_currentSub = num;
}
- delete [] lang;
-
//check if stream is seekable
sk = (bool)xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_SEEKABLE);
if ( vw->m_trackIsSeekable!=sk ) {
@@ -442,6 +441,7 @@
vw->m_trackIsSeekable = sk;
}
+ vw->m_mutex.unlock();
if ( update )
QApplication::postEvent(vw, new QTimerEvent(TIMER_EVENT_NEW_CHANNELS));
break;
@@ -705,7 +705,9 @@
}
case TIMER_EVENT_NEW_CHANNELS:
{
+ m_mutex.lock();
emit signalNewChannels(m_audioCh, m_subCh, m_currentAudio, m_currentSub);
+ m_mutex.unlock();
break;
}
case TIMER_EVENT_NEW_TITLE:
--- kaffeine/src/player-parts/xine-part/kxinewidget.h
+++ kaffeine/src/player-parts/xine-part/kxinewidget.h
@@ -47,6 +47,7 @@
class QTime;
#include <qtimer.h>
+#include <qmutex.h>
#include <qptrlist.h>
#include <qthread.h>
#include <X11/Xlib.h>
@@ -485,6 +486,7 @@
bool m_trackHasAudio;
bool m_trackHasChapters;
bool m_trackIsSeekable;
+ QMutex m_mutex;
/* dvb */
signals:

10
pedantic.diff
View File

@ -1,10 +0,0 @@
--- kaffeine/src/input/dvb/dvbstream.cpp
+++ kaffeine/src/input/dvb/dvbstream.cpp
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
+#include "dvbsection.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>