From: "Michael Palimaka (kensington)" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kmix/files: kmix-4.8.3-oss4.patch
Date: Thu, 17 May 2012 18:07:23 +0000 (UTC) [thread overview]
Message-ID: <20120517180723.007722004C@flycatcher.gentoo.org> (raw)
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;
}
next reply other threads:[~2012-05-17 18:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-17 18:07 Michael Palimaka (kensington) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-03 14:11 [gentoo-commits] gentoo-x86 commit in kde-base/kmix/files: kmix-4.8.3-oss4.patch Johannes Huber (johu)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120517180723.007722004C@flycatcher.gentoo.org \
--to=kensington@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox