rpms/amarok/F-7 amarok-1.4.7-147126.patch, NONE, 1.1 amarok.spec, 1.80, 1.81
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Sun Sep 2 12:45:21 UTC 2007
Author: abompard
Update of /cvs/pkgs/rpms/amarok/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6683/F-7
Modified Files:
amarok.spec
Added Files:
amarok-1.4.7-147126.patch
Log Message:
* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
- add patch for kde bug 147126 : amarok freezes when trying to play
mp3 files without mp3 support
amarok-1.4.7-147126.patch:
--- NEW FILE amarok-1.4.7-147126.patch ---
diff -up ./amarok/src/statusbar/statusBarBase.cpp.147126 ./amarok/src/statusbar/statusBarBase.cpp
--- ./amarok/src/statusbar/statusBarBase.cpp.147126 2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/statusbar/statusBarBase.cpp 2007-09-02 13:55:38.000000000 +0200
@@ -25,6 +25,7 @@
#include "squeezedtextlabel.h"
#include "statusBarBase.h"
#include "threadmanager.h"
+#include "enginecontroller.h"
#include <kio/job.h>
#include <kiconloader.h>
@@ -343,9 +344,13 @@ StatusBar::longMessageThreadSafe( const
void
StatusBar::customEvent( QCustomEvent *e )
{
- QString *s = static_cast<QString*>( e->data() );
- longMessage( *s );
- delete s;
+ if(e->type() == 1000 ){
+ QString *s = static_cast<QString*>( e->data() );
+ longMessage( *s );
+ delete s;
+ }else if(e->type() == 2000 ){
+ EngineController::instance()->unplayableNotification();
+ }
}
diff -up ./amarok/src/enginecontroller.cpp.147126 ./amarok/src/enginecontroller.cpp
--- ./amarok/src/enginecontroller.cpp.147126 2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.cpp 2007-09-02 13:55:38.000000000 +0200
@@ -244,13 +244,10 @@ bool EngineController::canDecode( const
if( engine() != EngineController::instance()->m_voidEngine )
{
//we special case this as otherwise users hate us
- if ( !valid && ext.lower() == "mp3" && !installDistroCodec(AmarokConfig::soundSystem()) )
- Amarok::StatusBar::instance()->longMessageThreadSafe(
- i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
- "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
- "the installation of the multimedia-framework that the current engine uses. "
- "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
- .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+ if ( !valid && ext.lower() == "mp3"){
+ QCustomEvent * e = new QCustomEvent( 2000 );
+ QApplication::postEvent( Amarok::StatusBar::instance(), e );
+ }
// Cache this result for the next lookup
if ( !ext.isEmpty() )
@@ -260,6 +257,17 @@ bool EngineController::canDecode( const
return valid;
}
+void EngineController::unplayableNotification() {
+
+ if( !installDistroCodec(AmarokConfig::soundSystem()))
+ Amarok::StatusBar::instance()->longMessageThreadSafe(
+ i18n( "<p>The %1 claims it <b>cannot</b> play MP3 files."
+ "<p>You may want to choose a different engine from the <i>Configure Dialog</i>, or examine "
+ "the installation of the multimedia-framework that the current engine uses. "
+ "<p>You may find useful information in the <i>FAQ</i> section of the <i>Amarok HandBook</i>." )
+ .arg( AmarokConfig::soundSystem() ), KDE::StatusBar::Error );
+}
+
bool EngineController::installDistroCodec( const QString& engine /*Filetype type*/)
{
KService::Ptr service = KTrader::self()->query( "Amarok/CodecInstall"
diff -up ./amarok/src/enginecontroller.h.147126 ./amarok/src/enginecontroller.h
--- ./amarok/src/enginecontroller.h.147126 2007-08-07 19:48:28.000000000 +0200
+++ ./amarok/src/enginecontroller.h 2007-09-02 13:55:38.000000000 +0200
@@ -52,6 +52,7 @@ public:
uint trackPosition() const;
EngineBase* loadEngine();
+ void unplayableNotification();
uint trackLength() const { return m_bundle.length() * 1000; }
const MetaBundle &bundle() const;
Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/F-7/amarok.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- amarok.spec 18 Aug 2007 06:56:53 -0000 1.80
+++ amarok.spec 2 Sep 2007 12:44:48 -0000 1.81
@@ -4,14 +4,15 @@
Name: amarok
Summary: Media player for KDE
Version: 1.4.7
-Release: 2%{?dist}
+Release: 4%{?dist}
Group: Applications/Multimedia
-License: GPL
+License: GPLv2+
Url: http://amarok.kde.org
# http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
#Source0: http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
Source0: ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Patch0: amarok-1.4.7-147126.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdemultimedia-devel >= 6:3.2
@@ -85,6 +86,7 @@
%prep
%setup -q
+%patch0 -p0 -b .147126
@@ -241,6 +243,13 @@
%changelog
+* Sun Sep 02 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-4
+- add patch for kde bug 147126 : amarok freezes when trying to play
+ mp3 files without mp3 support
+
+* Fri Aug 24 2007 Todd Zullinger <tmz at pobox.com> 1.4.7-3
+- rebuild with libgpod-0.5.2
+
* Sat Aug 18 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.4.7-2
- version 1.4.7
More information about the fedora-extras-commits
mailing list