rpms/kdemultimedia/F-13 kmix-pulse.patch,1.4,1.5
Rex Dieter
rdieter at fedoraproject.org
Tue Jun 15 16:44:31 UTC 2010
- Previous message: rpms/kdemultimedia/F-13 kdemultimedia.spec,1.183,1.184
- Next message: rpms/selinux-policy/F-13 modules-minimum.conf, 1.67, 1.68 modules-mls.conf, 1.80, 1.81 modules-targeted.conf, 1.176, 1.177 policy-F13.patch, 1.127, 1.128 selinux-policy.spec, 1.1029, 1.1030
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdemultimedia/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20227
Modified Files:
kmix-pulse.patch
Log Message:
omit already-upstreamed-in-kde-4.4.4 bits
kmix-pulse.patch:
CMakeLists.txt | 1
KMixApp.cpp | 14
dialogviewconfiguration.cpp | 9
kmix-platforms.cpp | 8
kmix.cpp | 53 +
kmix.h | 1
kmixerwidget.cpp | 2
kmixerwidget.h | 1
kmixprefdlg.h | 2
main.cpp | 1
mdwmoveaction.cpp | 48 +
mdwmoveaction.h | 46 +
mdwslider.cpp | 158 ++---
mdwslider.h | 14
mixdevice.cpp | 105 ++-
mixdevice.h | 15
mixdevicewidget.cpp | 1
mixdevicewidget.h | 2
mixer.cpp | 27
mixer.h | 9
mixer_alsa9.cpp | 4
mixer_backend.cpp | 17
mixer_backend.h | 6
mixer_pulse.cpp | 1337 +++++++++++++++++++++++++++++++++++++-------
mixer_pulse.h | 63 +-
verticaltext.cpp | 7
verticaltext.h | 1
viewbase.cpp | 72 ++
viewbase.h | 7
viewdockareapopup.cpp | 51 +
viewdockareapopup.h | 3
viewsliders.cpp | 18
viewsliders.h | 4
33 files changed, 1766 insertions(+), 341 deletions(-)
Index: kmix-pulse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/F-13/kmix-pulse.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kmix-pulse.patch 15 Jun 2010 16:18:26 -0000 1.4
+++ kmix-pulse.patch 15 Jun 2010 16:44:31 -0000 1.5
@@ -2603,241 +2603,6 @@ index 6dcd68b..6c43b0c 100644
-#endif
+#endif
-diff --git a/kmix/mixertoolbox.cpp b/kmix/mixertoolbox.cpp
-index f424916..873082f 100644
---- a/kmix/mixertoolbox.cpp
-+++ b/kmix/mixertoolbox.cpp
-@@ -37,7 +37,7 @@
-
-
- MixerToolBox* MixerToolBox::s_instance = 0;
--GUIProfile* MixerToolBox::s_fallbackProfile = 0;
-+QMap<Mixer*,GUIProfile*> MixerToolBox::s_fallbackProfiles;
- QRegExp MixerToolBox::s_ignoreMixerExpression("Modem");
- //KLocale* MixerToolBox::s_whatsthisLocale = 0;
-
-@@ -112,7 +112,8 @@ void MixerToolBox::initMixer(bool multiDriverMode, QString& ref_hwInfoString)
- for( int drv=0; drv<drvNum; drv++ )
- {
- QString driverName = Mixer::driverName(drv);
--
-+ kDebug(67100) << "Looking for mixers with the : " << driverName << " driver";
-+
- if ( autodetectionFinished ) {
- // inner loop indicates that we are finished => sane exit from outer loop
- break;
-@@ -136,31 +137,33 @@ void MixerToolBox::initMixer(bool multiDriverMode, QString& ref_hwInfoString)
- autodetectionFinished = true; // highest device number of driver and a Mixer => finished
- }
-
-- // append driverName (used drivers)
-- if ( mixerAccepted && !drvInfoAppended )
-- {
-- drvInfoAppended = true;
-- QString driverName = Mixer::driverName(drv);
-- if ( Mixer::mixers().count() > 1) {
-- driverInfoUsed += " + ";
-- }
-- driverInfoUsed += driverName;
-- }
--
-- // Check whether there are mixers in different drivers, so that the user can be warned
-- if (mixerAccepted && !multipleDriversActive)
-+ if ( mixerAccepted )
- {
-- if ( driverWithMixer == -1 )
-+ kDebug(67100) << "Success! Found a mixer with the : " << driverName << " driver";
-+ // append driverName (used drivers)
-+ if ( !drvInfoAppended )
- {
-- // Aha, this is the very first detected device
-- driverWithMixer = drv;
-+ drvInfoAppended = true;
-+ if ( Mixer::mixers().count() > 1)
-+ driverInfoUsed += " + ";
-+ driverInfoUsed += driverName;
- }
-- else if ( driverWithMixer != drv )
-+
-+ // Check whether there are mixers in different drivers, so that the user can be warned
-+ if ( !multipleDriversActive )
- {
-- // Got him: There are mixers in different drivers
-- multipleDriversActive = true;
-- }
-- } // !multipleDriversActive
-+ if ( driverWithMixer == -1 )
-+ {
-+ // Aha, this is the very first detected device
-+ driverWithMixer = drv;
-+ }
-+ else if ( driverWithMixer != drv )
-+ {
-+ // Got him: There are mixers in different drivers
-+ multipleDriversActive = true;
-+ }
-+ } // !multipleDriversActive
-+ } // mixerAccepted
-
- } // loop over sound card devices of current driver
-
-@@ -357,9 +360,13 @@ GUIProfile* MixerToolBox::selectProfile(Mixer* mixer)
-
- QString userProfileDir = KStandardDirs::locateLocal("appdata", "profiles/" );
-
-+ QString mixerNameSpacesToUnderscores = mixer->baseName();
-+ mixerNameSpacesToUnderscores.replace(" ","_");
-+
- // (1) User profile Directory
- QDir dir(userProfileDir);
- dir.setFilter(QDir::Files);
-+ dir.setNameFilters(QStringList(mixer->getDriverName() + "." + mixerNameSpacesToUnderscores + "*.xml"));
- QFileInfoList fileList = dir.entryInfoList();
-
- QString fileNamePrefix = "profiles/" + mixer->getDriverName() + ".";
-@@ -369,39 +376,34 @@ GUIProfile* MixerToolBox::selectProfile(Mixer* mixer)
- QString fileNameFQ;
- fileNameFQ = KStandardDirs::locate("appdata", fileName );
- kDebug() << fileName << "; fnfq1=" << fileNameFQ;
-- QFileInfo qfi1(fileNameFQ);
-- fileList.insert(0, qfi1);
-+ if (!fileNameFQ.isEmpty())
-+ fileList.insert(0, QFileInfo(fileNameFQ));
-
- // (3) Soundcard specific profile (usually from system Directory)
-- QString mixerNameSpacesToUnderscores = mixer->baseName();
-- mixerNameSpacesToUnderscores.replace(" ","_");
- fileName = fileNamePrefix + mixerNameSpacesToUnderscores + ".xml";
- fileNameFQ = KStandardDirs::locate("appdata", fileName );
- kDebug() << fileName << "; fnfq2=" << fileNameFQ;
-- QFileInfo qfi2(fileNameFQ);
-- fileList.insert(0, qfi2);
-+ if (!fileNameFQ.isEmpty())
-+ fileList.insert(0, QFileInfo(fileNameFQ));
-
-
-
- for (int i = 0; i < fileList.size(); ++i) {
- QFileInfo fileInfo = fileList.at(i);
-- kDebug() << i << ": Check user profile " << fileInfo.fileName() ;
-- if ( QDir::match( "*.xml", fileInfo.fileName() ) ) {
-- QString fileNameAbs = fileInfo.absoluteFilePath();
-- QString fileNameRelToProfile = "profiles/" + fileInfo.fileName();
-- kDebug() << i << ": Try user profile " << fileNameAbs;
-- GUIProfile* guiprofTemp = new GUIProfile();
-- if ( guiprofTemp->readProfile(fileNameAbs, fileNameRelToProfile) ) {
-- matchValueTemp = guiprofTemp->match(mixer);
-- if ( matchValueTemp < matchValueBest ) {
-- delete guiprofTemp;
-- guiprofTemp = 0;
-- matchValueTemp = 0;
-- }
-- else {
-- guiprofBest = guiprofTemp;
-- matchValueBest = matchValueTemp;
-- }
-+ QString fileNameAbs = fileInfo.absoluteFilePath();
-+ QString fileNameRelToProfile = "profiles/" + fileInfo.fileName();
-+ kDebug() << i << ": Try user profile " << fileNameAbs;
-+ GUIProfile* guiprofTemp = new GUIProfile();
-+ if ( guiprofTemp->readProfile(fileNameAbs, fileNameRelToProfile) ) {
-+ matchValueTemp = guiprofTemp->match(mixer);
-+ if ( matchValueTemp < matchValueBest ) {
-+ delete guiprofTemp;
-+ guiprofTemp = 0;
-+ matchValueTemp = 0;
-+ }
-+ else {
-+ guiprofBest = guiprofTemp;
-+ matchValueBest = matchValueTemp;
- }
- }
- }
-@@ -411,33 +413,40 @@ kDebug() << fileName << "; fnfq2=" << fileNameFQ;
- // Still no profile found. This should usually not happen. This means one of the following things:
- // a) The KMix installation is not OK
- // b) The user has a defective profile in ~/.kde/share/apps/kmix/profiles/
-- // c) It is a Backend that ships no default profile (currently this is only Mixer_SUN)
-- if ( s_fallbackProfile == 0 ) {
-- s_fallbackProfile = new GUIProfile();
--
-- ProfProduct* prd = new ProfProduct();
-- prd->vendor = mixer->getDriverName();
-- prd->productName = mixer->readableName();
-- prd->productRelease = "1.0";
-- s_fallbackProfile->_products.insert(prd);
--
-- ProfControl* ctl = new ProfControl();
-- ctl->id = ".*";
-- ctl->regexp = ".*"; // make sure id matches the regexp
-- ctl->subcontrols = ".*";
-- ctl->show = "simple";
-- s_fallbackProfile->_controls.push_back(ctl);
--
-- s_fallbackProfile->_soundcardDriver = mixer->getDriverName();
-- s_fallbackProfile->_soundcardName = mixer->readableName();
--
-- s_fallbackProfile->finalizeProfile();
-- }
-- guiprofBest = s_fallbackProfile;
-+ // c) It is a Backend that ships no default profile (currently this is only Mixer_SUN and Mixer_PULSE)
-+ guiprofBest = fallbackProfile(mixer);
- }
- // kDebug(67100) << "New Best =" << matchValueBest << " pointer=" << guiprofBest << "\n";
-
- return guiprofBest;
- }
-
-+
-+GUIProfile* MixerToolBox::fallbackProfile(Mixer *mixer)
-+{
-+ if ( ! s_fallbackProfiles.contains(mixer) ) {
-+ GUIProfile *fallback = new GUIProfile();
-+
-+ ProfProduct* prd = new ProfProduct();
-+ prd->vendor = mixer->getDriverName();
-+ prd->productName = mixer->readableName();
-+ prd->productRelease = "1.0";
-+ fallback->_products.insert(prd);
-+
-+ ProfControl* ctl = new ProfControl();
-+ ctl->id = ".*";
-+ ctl->regexp = ".*"; // make sure id matches the regexp
-+ ctl->subcontrols = ".*";
-+ ctl->show = "simple";
-+ fallback->_controls.push_back(ctl);
-+
-+ fallback->_soundcardDriver = mixer->getDriverName();
-+ fallback->_soundcardName = mixer->readableName();
-+
-+ fallback->finalizeProfile();
-+ s_fallbackProfiles[mixer] = fallback;
-+ }
-+ return s_fallbackProfiles[mixer];
-+}
-+
- #include "mixertoolbox.moc"
-diff --git a/kmix/mixertoolbox.h b/kmix/mixertoolbox.h
-index 2af5118..fa19645 100644
---- a/kmix/mixertoolbox.h
-+++ b/kmix/mixertoolbox.h
-@@ -53,6 +53,7 @@ class MixerToolBox : public QObject
-
- Mixer* find( const QString& mixer_id);
- GUIProfile* selectProfile(Mixer*);
-+ GUIProfile* fallbackProfile(Mixer*);
- //static KLocale* whatsthisControlLocale();
-
- signals:
-@@ -60,7 +61,7 @@ class MixerToolBox : public QObject
-
- private:
- static MixerToolBox* s_instance;
-- static GUIProfile* s_fallbackProfile;
-+ static QMap<Mixer*,GUIProfile*> s_fallbackProfiles;
- QMap<QString,int> s_mixerNums;
- static QRegExp s_ignoreMixerExpression;
-
diff --git a/kmix/verticaltext.cpp b/kmix/verticaltext.cpp
index 3cdfc88..62cd32a 100644
--- a/kmix/verticaltext.cpp
- Previous message: rpms/kdemultimedia/F-13 kdemultimedia.spec,1.183,1.184
- Next message: rpms/selinux-policy/F-13 modules-minimum.conf, 1.67, 1.68 modules-mls.conf, 1.80, 1.81 modules-targeted.conf, 1.176, 1.177 policy-F13.patch, 1.127, 1.128 selinux-policy.spec, 1.1029, 1.1030
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list