Hello community, here is the log from the commit of package kdemultimedia4 for openSUSE:Factory checked in at 2012-03-13 09:32:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdemultimedia4 (Old) and /work/SRC/openSUSE:Factory/.kdemultimedia4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdemultimedia4", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdemultimedia4/kdemultimedia4.changes 2012-01-27 15:20:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdemultimedia4.new/kdemultimedia4.changes 2012-03-13 09:33:25.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 2 23:14:28 CET 2012 - dmuel...@suse.de + +- update to 4.8.1 + * see http://kde.org/announcements/changelogs/changelog4_8_0to4_8_1.php for details + +------------------------------------------------------------------- Old: ---- kdemultimedia-4.8.0.tar.bz2 New: ---- kdemultimedia-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.qqQccG/_old 2012-03-13 09:33:26.000000000 +0100 +++ /var/tmp/diff_new_pack.qqQccG/_new 2012-03-13 09:33:26.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_with ffmpeg Name: kdemultimedia4 @@ -39,7 +40,7 @@ BuildRequires: taglib-devel BuildRequires: xine-devel BuildRequires: xine-lib -Version: 4.8.0 +Version: 4.8.1 Release: 0 Summary: Base package for KDE multimedia applications License: GPL-2.0+ ++++++ kdemultimedia-4.8.0.tar.bz2 -> kdemultimedia-4.8.1.tar.bz2 ++++++ Files old/kdemultimedia-4.8.0/doc/dragonplayer/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/dragonplayer/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/juk/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/juk/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/kcontrol/cddbretrieval/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/kcontrol/cddbretrieval/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/kioslave/audiocd/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/kioslave/audiocd/index.cache.bz2 differ Files old/kdemultimedia-4.8.0/doc/kmix/index.cache.bz2 and new/kdemultimedia-4.8.1/doc/kmix/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/cache.cpp new/kdemultimedia-4.8.1/juk/cache.cpp --- old/kdemultimedia-4.8.0/juk/cache.cpp 2011-07-27 20:25:35.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/cache.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -200,6 +200,14 @@ Playlist *p = new Playlist(collection, true); createdPlaylists.append(p); s >> *p; + + // We may have already read this playlist from the folder + // scanner, if an .m3u playlist + if(collection->containsPlaylistFile(p->fileName())) { + delete p; + p = 0; + } + playlist = p; break; } // switch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/main.cpp new/kdemultimedia-4.8.1/juk/main.cpp --- old/kdemultimedia-4.8.0/juk/main.cpp 2011-07-27 20:25:35.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/main.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { KAboutData aboutData("juk", 0, ki18n("JuK"), - "3.7", ki18n(description), KAboutData::License_GPL, + "3.7.1", ki18n(description), KAboutData::License_GPL, ki18n("© 2002 - 2011, Scott Wheeler"), KLocalizedString(), "http://developer.kde.org/~wheeler/juk.html";); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/playlist.cpp new/kdemultimedia-4.8.1/juk/playlist.cpp --- old/kdemultimedia-4.8.0/juk/playlist.cpp 2011-08-22 15:32:22.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/playlist.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -381,7 +381,7 @@ m_widthsDirty(true), m_searchEnabled(true), m_lastSelected(0), - m_fileName(playlistFile.absoluteFilePath()), + m_fileName(playlistFile.canonicalFilePath()), m_rmbMenu(0), m_toolTip(0), m_blockDataChanged(false) @@ -1880,7 +1880,7 @@ } if(importPlaylists && MediaFiles::isPlaylistFile(file) && - !m_collection->containsPlaylistFile(fileInfo.absoluteFilePath())) + !m_collection->containsPlaylistFile(fileInfo.canonicalFilePath())) { new Playlist(m_collection, fileInfo); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/juk/playlistcollection.h new/kdemultimedia-4.8.1/juk/playlistcollection.h --- old/kdemultimedia-4.8.0/juk/playlistcollection.h 2011-07-27 20:25:35.000000000 +0200 +++ new/kdemultimedia-4.8.1/juk/playlistcollection.h 2012-03-01 00:04:51.000000000 +0100 @@ -152,6 +152,15 @@ virtual void raise(Playlist *playlist); /** + * @return true, if a playlist with the file name given in @p file is + * already loaded into this collection, or false otherwise. + * + * @note @p file should be the "canonical" full path to the file to avoid + * problems with duplicates and symlinks. + */ + bool containsPlaylistFile(const QString &file) const; + + /** * This is used to put up a temporary widget over the top of the playlist * stack. This is part of a trick to significantly speed up painting by * hiding the playlist to which items are being added. @@ -167,7 +176,6 @@ virtual void removePlaylist(Playlist *playlist) = 0; bool importPlaylists() const; - bool containsPlaylistFile(const QString &file) const; QString playlistNameDialog(const QString &caption = i18n("Create New Playlist"), const QString &suggest = QString(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/apps/kmix.h new/kdemultimedia-4.8.1/kmix/apps/kmix.h --- old/kdemultimedia-4.8.0/kmix/apps/kmix.h 2011-12-20 22:00:16.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/apps/kmix.h 2012-03-01 00:04:51.000000000 +0100 @@ -60,6 +60,7 @@ ~KMixWindow(); bool updateDocking(); + Qt::Orientation toplevelOrientation() { return m_toplevelOrientation; } private: void saveBaseConfig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/backends/mixer_sun.cpp new/kdemultimedia-4.8.1/kmix/backends/mixer_sun.cpp --- old/kdemultimedia-4.8.0/kmix/backends/mixer_sun.cpp 2011-08-22 15:32:25.000000000 +0200 +++ new/kdemultimedia-4.8.1/kmix/backends/mixer_sun.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -189,7 +189,7 @@ Volume::ChannelMask chnmask = Volume::MLEFT; if ( stereodevs & ( 1 << idx ) ) chnmask = (Volume::ChannelMask)(chnmask|Volume::MRIGHT); - Volume playbackVol( chnmask, 100, 1, true, false ); + Volume playbackVol( 100, 1, true, false ); QString id; id.setNum(idx); MixDevice* md = new MixDevice( _mixer, id, @@ -199,7 +199,7 @@ if ( recmask & ( 1 << idx ) ) { // can be captured => add capture volume, with no capture volume chnmask = Volume::MNONE; - Volume captureVol( chnmask, 100, 1, true, true ); + Volume captureVol( 100, 1, true, true ); md->addCaptureVolume(captureVol); } m_mixDevices.append( md ); @@ -424,26 +424,26 @@ void Mixer_SUN::VolumeToGainBalance( Volume& volume, uint_t& gain, uchar_t& balance ) { if ( ( volume.count() == 1 ) || - ( volume[Volume::LEFT] == volume[Volume::RIGHT] ) ) + ( volume.getVolume(Volume::LEFT) == volume.getVolume(Volume::RIGHT) ) ) { - gain = volume[Volume::LEFT]; + gain = volume.getVolume(Volume::LEFT); balance = AUDIO_MID_BALANCE; } else { - if ( volume[Volume::LEFT] > volume[Volume::RIGHT] ) + if ( volume.getVolume(Volume::LEFT) > volume.getVolume(Volume::RIGHT) ) { - gain = volume[Volume::LEFT]; + gain = volume.getVolume(Volume::LEFT); balance = AUDIO_LEFT_BALANCE + ( AUDIO_MID_BALANCE - AUDIO_LEFT_BALANCE ) * - volume[Volume::RIGHT] / volume[Volume::LEFT]; + volume.getVolume(Volume::RIGHT) / volume.getVolume(Volume::LEFT); } else { - gain = volume[Volume::RIGHT]; + gain = volume.getVolume(Volume::RIGHT); balance = AUDIO_RIGHT_BALANCE - ( AUDIO_RIGHT_BALANCE - AUDIO_MID_BALANCE ) * - volume[Volume::LEFT] / volume[Volume::RIGHT]; + volume.getVolume(Volume::LEFT) / volume.getVolume(Volume::RIGHT); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/gui/kmixdockwidget.cpp new/kdemultimedia-4.8.1/kmix/gui/kmixdockwidget.cpp --- old/kdemultimedia-4.8.0/kmix/gui/kmixdockwidget.cpp 2011-12-20 22:00:16.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/gui/kmixdockwidget.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -101,6 +101,7 @@ _volWA->setDefaultWidget(_referenceWidget2); _referenceWidget->addAction(_volWA); + connect( m_mixer, SIGNAL(controlChanged()), _referenceWidget2, SLOT(refreshVolumeLevels()) ); //setAssociatedWidget(_referenceWidget); //setAssociatedWidget(_referenceWidget); // If you use the popup, associate that instead of the MainWindow @@ -273,6 +274,9 @@ vol = md->captureVolume(); } int percentage = vol.getAvgVolumePercent(Volume::MALL); + + // kDebug() << "TrayVol id=" << md->id() << " vol=" << vol.getAvgVolumePercent(Volume::MALL); + if ( percentage <= 0 ) newPixmapType = '0'; // Hint: also negative-values else if ( percentage < 25 ) newPixmapType = '1'; else if ( percentage < 75 ) newPixmapType = '2'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/gui/viewdockareapopup.cpp new/kdemultimedia-4.8.1/kmix/gui/viewdockareapopup.cpp --- old/kdemultimedia-4.8.0/kmix/gui/viewdockareapopup.cpp 2011-12-20 22:00:16.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/gui/viewdockareapopup.cpp 2012-03-01 00:04:51.000000000 +0100 @@ -134,7 +134,7 @@ true, // Show Mute LED false, // Show Record LED false, // Small - Qt::Horizontal, // Direction: only 1 device, so doesn't matter + _dock->toplevelOrientation(), // Direction: only 1 device, so doesn't matter this, // parent 0 // Is "NULL", so that there is no RMB-popup , pctl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdemultimedia-4.8.0/kmix/plasma/engine/plasma-engine-mixer.desktop new/kdemultimedia-4.8.1/kmix/plasma/engine/plasma-engine-mixer.desktop --- old/kdemultimedia-4.8.0/kmix/plasma/engine/plasma-engine-mixer.desktop 2012-01-18 19:50:30.000000000 +0100 +++ new/kdemultimedia-4.8.1/kmix/plasma/engine/plasma-engine-mixer.desktop 2012-03-01 00:04:51.000000000 +0100 @@ -32,6 +32,7 @@ Name[pt_BR]=Mecanismo de dados do mixer Name[ro]=MotorDate mixer Name[ru]=Источник данных Plasma для работы с микшером +Name[sk]=Dátový stroj zmiešavača Name[sr]=Датомотор миксете Name[sr@ijekavian]=Датомотор миксете Name[sr@ijekavianlatin]=Datomotor miksete -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
