Hello community, here is the log from the commit of package amarok checked in at Fri Sep 1 15:15:34 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-08-24 14:29:50.000000000 +0200 +++ amarok/amarok.changes 2006-09-01 13:40:12.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Sep 1 13:39:12 CEST 2006 - dmueller@suse.de + +- add 1.4.2 patcheset1: + * Collection scanner would only restart a maximum of 2 times + instead of 20 + * AudioCD playboack stutters and sometimes freezes Amarok + * Bugfix for creating the collection database with SQLite. + +------------------------------------------------------------------- New: ---- audiocd.diff collection.diff scanner.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.pMeDdm/_old 2006-09-01 15:15:17.000000000 +0200 +++ /var/tmp/diff_new_pack.pMeDdm/_new 2006-09-01 15:15:17.000000000 +0200 @@ -30,7 +30,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.2 -Release: 4 +Release: 6 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -43,6 +43,9 @@ Patch7: amarok-collectionscanner.diff Patch8: libmtp-0012.diff Patch10: default-engine.diff +Patch11: audiocd.diff +Patch12: collection.diff +Patch14: scanner.diff %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -139,6 +142,11 @@ dos2unix amarok/src/mediadevice/mtp/mtpmediadevice.cpp %patch8 %patch10 +cd amarok +%patch11 +%patch12 +%patch14 +cd .. cp %{S:10} amarok/src/engine/helix/ . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -257,6 +265,12 @@ %endif %changelog -n amarok +* Fri Sep 01 2006 - dmueller@suse.de +- add 1.4.2 patcheset1: + * Collection scanner would only restart a maximum of 2 times + instead of 20 + * AudioCD playboack stutters and sometimes freezes Amarok + * Bugfix for creating the collection database with SQLite. * Thu Aug 24 2006 - dmueller@suse.de - only give amarok http urls, it has no KIO support (#174512) * Wed Aug 23 2006 - stbinner@suse.de ++++++ audiocd.diff ++++++ Index: src/collectiondb.cpp =================================================================== --- src/collectiondb.cpp (Revision 578457) +++ src/collectiondb.cpp (Revision 578458) @@ -3463,28 +3463,6 @@ bundle->copyFrom( peb ); valid = true; } - else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" ) - { - // try to see if the engine has some info about the - // item (the intended behaviour should be that if the - // item is an AudioCD track, the engine can return - // CDDB data for it) - Engine::SimpleMetaBundle smb; - if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) ) - { - valid = true; - bundle->setTitle( smb.title ); - bundle->setArtist( smb.artist ); - bundle->setAlbum( smb.album ); - bundle->setComment( smb.comment ); - bundle->setGenre( smb.genre ); - bundle->setBitrate( smb.bitrate.toInt() ); - bundle->setSampleRate( smb.samplerate.toInt() ); - bundle->setLength( smb.length.toInt() ); - bundle->setYear( smb.year.toInt() ); - bundle->setTrack( smb.tracknr.toInt() ); - } - } } return valid; ++++++ collection.diff ++++++ Index: src/collectiondb.cpp =================================================================== --- src/collectiondb.cpp (Revision 577764) +++ src/collectiondb.cpp (Revision 577765) @@ -5761,7 +5761,8 @@ { QStringList values; - int error, rc; + int error; + int rc = 0; const char* tail; sqlite3_stmt* stmt; int busyCnt = 0; @@ -5787,6 +5788,7 @@ Debug::error() << sqlite3_errmsg( m_db ) << endl; Debug::error() << "on query: " << statement << endl; values = QStringList(); + break; } else { @@ -5851,7 +5853,8 @@ int SqliteConnection::insert( const QString& statement, const QString& /* table */ ) { - int error, rc; + int error; + int rc = 0; const char* tail; sqlite3_stmt* stmt; int busyCnt = 0; @@ -5876,6 +5879,7 @@ Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl; Debug::error() << sqlite3_errmsg( m_db ) << endl; Debug::error() << "on insert: " << statement << endl; + break; } else { ++++++ scanner.diff ++++++ Index: src/scancontroller.h =================================================================== --- src/scancontroller.h (Revision 578921) +++ src/scancontroller.h (Revision 578922) @@ -99,7 +99,7 @@ void customEvent( QCustomEvent* ); // Member variables: - static const uint MAX_RESTARTS = 2; + static const uint MAX_RESTARTS = 20; KProcIO* m_scanner; QStringList m_folders; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org