diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-09-03 14:11:54 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-09-03 14:11:54 +0000 |
| commit | cf82e201f2cdceec20131c15315d5b185c21af2a (patch) | |
| tree | 06d62a60e61459038c0faaf643428b1a45d27834 /kde-base/kmix | |
| parent | Remove old. (diff) | |
| download | gentoo-2-cf82e201f2cdceec20131c15315d5b185c21af2a.tar.gz gentoo-2-cf82e201f2cdceec20131c15315d5b185c21af2a.tar.bz2 gentoo-2-cf82e201f2cdceec20131c15315d5b185c21af2a.zip | |
Remove old.
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kmix')
| -rw-r--r-- | kde-base/kmix/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kmix/files/kmix-4.8.3-oss4.patch | 112 |
2 files changed, 4 insertions, 113 deletions
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog index 81451028a104..b504d83459b8 100644 --- a/kde-base/kmix/ChangeLog +++ b/kde-base/kmix/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for kde-base/kmix # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.227 2012/09/03 13:29:21 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.228 2012/09/03 14:11:54 johu Exp $ + + 03 Sep 2012; Johannes Huber <johu@gentoo.org> -files/kmix-4.8.3-oss4.patch: + Remove old. 03 Sep 2012; Johannes Huber <johu@gentoo.org> -kmix-4.7.4.ebuild: Remove KDE SC 4.7.4 diff --git a/kde-base/kmix/files/kmix-4.8.3-oss4.patch b/kde-base/kmix/files/kmix-4.8.3-oss4.patch deleted file mode 100644 index da5e7ccf54dd..000000000000 --- a/kde-base/kmix/files/kmix-4.8.3-oss4.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- kmix/backends/mixer_oss4.cpp.org 2012-05-13 07:52:08.206663114 +0200 -+++ kmix/backends/mixer_oss4.cpp 2012-05-13 09:08:36.277009292 +0200 -@@ -335,10 +335,13 @@ - Volume vol (ext.maxvalue, ext.minvalue, false, isCapture); - vol.addVolumeChannels(chMask); - -- MixDevice* md = new MixDevice(_mixer, -+ MixDevice* md_ptr = new MixDevice(_mixer, - QString::number(i), - name, - cType); -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); - - if(isCapture) - { -@@ -360,8 +363,6 @@ - m_recommendedMaster = md; - masterChosen = true; - } -- -- m_mixDevices.append(md->addToPool()); - } - else if ( ext.type == MIXT_HEXVALUE ) - { -@@ -369,10 +370,13 @@ - Volume vol (ext.maxvalue, ext.minvalue, false, isCapture); - vol.addVolumeChannels(chMask); - -- MixDevice* md = new MixDevice(_mixer, -+ MixDevice* md_ptr = new MixDevice(_mixer, - QString::number(i), - name, - cType); -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); - - if(isCapture) - { -@@ -388,8 +392,6 @@ - m_recommendedMaster = md; - masterChosen = true; - } -- -- m_mixDevices.append(md->addToPool()); - } - else if ( ext.type == MIXT_ONOFF - #ifdef MIXT_MUTE -@@ -406,11 +408,15 @@ - vol.setSwitchType (Volume::SpecialSwitch); - } - -- MixDevice* md = new MixDevice(_mixer, -+ MixDevice* md_ptr = new MixDevice(_mixer, - QString::number(i), - name, - cType); -- if(isCapture) -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); -+ -+ if(isCapture) - { - md->addCaptureVolume(vol); - } -@@ -418,8 +424,6 @@ - { - md->addPlaybackVolume(vol); - } -- -- m_mixDevices.append(md->addToPool()); - } - else if ( ext.type == MIXT_ENUM ) - { -@@ -431,9 +435,9 @@ - { - Volume vol(ext.maxvalue, ext.minvalue, - false, isCapture); -- vol.addVolumeChannel(VolumeChannel(Volume::MLEFT)); -+ vol.addVolumeChannel(VolumeChannel(Volume::LEFT)); - -- MixDevice* md = new MixDevice (_mixer, -+ MixDevice* md_ptr = new MixDevice (_mixer, - QString::number(i), - name, - cType); -@@ -451,9 +455,10 @@ - } - enumValuesRef.append( new QString(thisElement) ); - } -- md->addEnums(enumValuesRef); -- -- m_mixDevices.append(md->addToPool()); -+ md_ptr->addEnums(enumValuesRef); -+ -+ shared_ptr<MixDevice> md = md_ptr->addToPool(); -+ m_mixDevices.append(md); - } - } - -@@ -477,7 +482,7 @@ - m_isOpen = false; - int l_i_ret = ::close(m_fd); - m_mixDevices.clear(); -- m_recommendedMaster = NULL; -+ m_recommendedMaster.reset(); - return l_i_ret; - } - |