* [gentoo-commits] gentoo-x86 commit in kde-base/kmix/files: kmix-4.8.3-oss4.patch
@ 2012-05-17 18:07 Michael Palimaka (kensington)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka (kensington) @ 2012-05-17 18:07 UTC (permalink / raw
To: gentoo-commits
kensington 12/05/17 18:07:22
Added: kmix-4.8.3-oss4.patch
Log:
Fix build with OSS4. Patch by Franz Fellner <alpine.art.de@googlemail.com>. Fixes bug #415573.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Revision Changes Path
1.1 kde-base/kmix/files/kmix-4.8.3-oss4.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmix/files/kmix-4.8.3-oss4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kmix/files/kmix-4.8.3-oss4.patch?rev=1.1&content-type=text/plain
Index: kmix-4.8.3-oss4.patch
===================================================================
--- 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;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in kde-base/kmix/files: kmix-4.8.3-oss4.patch
@ 2012-09-03 14:11 Johannes Huber (johu)
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber (johu) @ 2012-09-03 14:11 UTC (permalink / raw
To: gentoo-commits
johu 12/09/03 14:11:54
Removed: kmix-4.8.3-oss4.patch
Log:
Remove old.
(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-03 14:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-17 18:07 [gentoo-commits] gentoo-x86 commit in kde-base/kmix/files: kmix-4.8.3-oss4.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2012-09-03 14:11 Johannes Huber (johu)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox