[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/kmix
From: Christian Esken <esken () kde ! org>
Date: 2011-08-11 22:46:31
Message-ID: 20110811224631.070CFAC7CB () svn ! kde ! org
[Download RAW message or body]
SVN commit 1246529 by esken:
Eliminate copy constructor. Makes the OSD and DBUS work again, as it operates on \
references w/o copying.
M +1 -1 apps/kmix.cpp
M +0 -3 core/MasterControl.cpp
M +12 -12 core/volume.cpp
M +1 -1 core/volume.h
M +2 -2 dbus/dbuscontrolwrapper.cpp
--- trunk/KDE/kdemultimedia/kmix/apps/kmix.cpp #1246528:1246529
@@ -995,7 +995,7 @@
MixDevice *md = Mixer::getGlobalMasterMD();
if ( md == 0 ) return; // shouldn't happen, but lets play safe
// Current volume
- Volume vol = md->playbackVolume();
+ Volume& vol = md->playbackVolume();
int currentVolume = vol.maxVolume()
? vol.getAvgVolume( (Volume::ChannelMask)(Volume::MLEFT | \
Volume::MRIGHT) ) * 100 / vol.maxVolume() : 0;
--- trunk/KDE/kdemultimedia/kmix/core/MasterControl.cpp #1246528:1246529
@@ -9,13 +9,10 @@
MasterControl::MasterControl()
{
- // TODO Auto-generated constructor stub
-
}
MasterControl::~MasterControl()
{
- // TODO Auto-generated destructor stub
}
QString MasterControl::getCard() const
--- trunk/KDE/kdemultimedia/kmix/core/volume.cpp #1246528:1246529
@@ -94,18 +94,18 @@
_volumesL.insert(ch.chid, ch);
}
-// copy constructor
-Volume::Volume( const Volume &v )
-{
- _chmask = v._chmask;
- _maxVolume = v._maxVolume;
- _minVolume = v._minVolume;
- _hasSwitch = v._hasSwitch;
- _switchActivated = v._switchActivated;
- _isCapture = v._isCapture;
- setVolume(v, (ChannelMask)v._chmask);
- // kDebug(67100) << "Volume::copy-constructor initialized " << v << "\n";
-}
+//// copy constructor
+//Volume::Volume( const Volume &v )
+//{
+// _chmask = v._chmask;
+// _maxVolume = v._maxVolume;
+// _minVolume = v._minVolume;
+// _hasSwitch = v._hasSwitch;
+// _switchActivated = v._switchActivated;
+// _isCapture = v._isCapture;
+// setVolume(v, (ChannelMask)v._chmask);
+// // kDebug(67100) << "Volume::copy-constructor initialized " << v << "\n";
+//}
void Volume::init( ChannelMask chmask, long maxVolume, long minVolume, bool \
hasSwitch, bool isCapture ) {
--- trunk/KDE/kdemultimedia/kmix/core/volume.h #1246528:1246529
@@ -88,7 +88,7 @@
// compatibility constructor
// Volume( int channels, long maxVolume );
// copy constructor
- Volume( const Volume &v );
+ //Volume( const Volume &v );
private:
// constructor for dummy volumes
Volume();
--- trunk/KDE/kdemultimedia/kmix/dbus/dbuscontrolwrapper.cpp #1246528:1246529
@@ -76,7 +76,7 @@
int DBusControlWrapper::volume()
{
- Volume vol = m_md->playbackVolume();
+ Volume& vol = m_md->playbackVolume();
return vol.maxVolume()
? vol.getAvgVolume( (Volume::ChannelMask)(Volume::MLEFT | Volume::MRIGHT) ) * 100 \
/ vol.maxVolume() : 0;
@@ -116,7 +116,7 @@
long DBusControlWrapper::absoluteVolume()
{
// @todo hardcoded
- Volume vol = m_md->playbackVolume();
+ Volume& vol = m_md->playbackVolume();
return ( vol.getAvgVolume( (Volume::ChannelMask)(Volume::MLEFT | Volume::MRIGHT) ) \
); }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic