From kde-commits Sat Oct 08 14:00:48 2011 From: Christian Esken Date: Sat, 08 Oct 2011 14:00:48 +0000 To: kde-commits Subject: KDE/kdemultimedia/kmix Message-Id: <20111008140048.54759AC886 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=131808247305714 SVN commit 1257961 by esken: Faster id2num() code for ALSA backend (called quite often according to Callgrind). Also cleanups / removing debug output. M +1 -1 backends/mixer_alsa9.cpp M +1 -1 core/volume.cpp M +3 -9 core/volume.h M +1 -1 gui/guiprofile.cpp M +12 -12 gui/mdwslider.cpp M +1 -1 gui/viewbase.cpp M +2 -2 gui/viewdockareapopup.cpp --- trunk/KDE/kdemultimedia/kmix/backends/mixer_alsa9.cpp #1257960:1257961 @@ -805,7 +805,7 @@ default: kDebug() << "FATAL: Unknown channel type for playback << " << vc.chid << " ... please report this"; break; } if ( ret != 0 ) kDebug() << "writeVolumeToHW(" << devnum << ") [set_playback_volume] failed, errno=" << ret; - if (id== "Master:0" || id== "PCM:0" ) { kDebug() << "volumePlayback control=" << id << ", chid=" << vc.chid << ", vol=" << vc.volume; } + //if (id== "Master:0" || id== "PCM:0" ) { kDebug() << "volumePlayback control=" << id << ", chid=" << vc.chid << ", vol=" << vc.volume; } } } // has playback volume --- trunk/KDE/kdemultimedia/kmix/core/volume.cpp #1257960:1257961 @@ -204,7 +204,7 @@ qreal volShiftedToZero = volume - _minVolume; qreal percentReal = ( volSpan == 0 ) ? 0 : ( 100 * volShiftedToZero ) / ( volSpan - 1); int percent = qRound(percentReal); - kDebug() << "volSpan=" << volSpan << ", volume=" << volume << ", volShiftedToPositive=" << volShiftedToZero << ", percent=" << percent; + //kDebug() << "volSpan=" << volSpan << ", volume=" << volume << ", volShiftedToPositive=" << volShiftedToZero << ", percent=" << percent; return percent; } --- trunk/KDE/kdemultimedia/kmix/core/volume.h #1257960:1257961 @@ -85,15 +85,6 @@ // regular constructor Volume(long maxVolume, long minVolume, bool hasSwitch, bool isCapture ); void addVolumeChannel(VolumeChannel ch); - // compatibility constructor - // Volume( int channels, long maxVolume ); - // copy constructor - //Volume( const Volume &v ); -private: - // constructor for dummy volumes - Volume(); - -public: /// @Deprecated void addVolumeChannels(ChannelMask chmask); @@ -154,6 +145,9 @@ private: + // constructor for dummy volumes + Volume(); + void init( ChannelMask chmask, long maxVolume, long minVolume, bool hasSwitch, bool isCapture); long volrange( long vol ); --- trunk/KDE/kdemultimedia/kmix/gui/guiprofile.cpp #1257960:1257961 @@ -578,7 +578,7 @@ QStringListIterator qslIt(qsl); while (qslIt.hasNext()) { QString sctl = qslIt.next(); - kDebug() << "setSubcontrols found: " << sctl.toLocal8Bit().constData() << endl; + //kDebug() << "setSubcontrols found: " << sctl.toLocal8Bit().constData() << endl; if ( sctl == "pvolume" ) _useSubcontrolPlayback = true; else if ( sctl == "cvolume" ) _useSubcontrolCapture = true; else if ( sctl == "pswitch" ) _useSubcontrolPlaybackSwitch = true; --- trunk/KDE/kdemultimedia/kmix/gui/mdwslider.cpp #1257960:1257961 @@ -531,7 +531,7 @@ foreach (VolumeChannel vc, vols ) { - kDebug(67100) << "Add label to " << vc.chid << ": " << Volume::ChannelNameReadable[vc.chid]; + //kDebug(67100) << "Add label to " << vc.chid << ": " << Volume::ChannelNameReadable[vc.chid]; QWidget *subcontrolLabel; QString subcontrolTranslation; @@ -710,7 +710,7 @@ MDWSlider::setStereoLinkedInternal(QList& ref_sliders, bool showSubcontrolLabels) { if ( ref_sliders.isEmpty()) return; - kDebug() << "m_linked=" << m_linked << "showSubcontrolLabels" << showSubcontrolLabels; + // kDebug() << "m_linked=" << m_linked << "showSubcontrolLabels" << showSubcontrolLabels; bool first = true; foreach ( QAbstractSlider* slider1, ref_sliders ) @@ -836,10 +836,10 @@ /** This slot is called, when a user has changed the volume via the KMix Slider. */ void MDWSlider::volumeChange( int ) { - if ( mixDevice()->id() == "Headphone:0" ) - { - kDebug(67100) << "headphone bug"; - } +// if ( mixDevice()->id() == "Headphone:0" ) +// { +// kDebug(67100) << "headphone bug"; +// } if (m_slidersPlayback.count() > 0) volumeChangeInternal(m_mixdevice->playbackVolume(), m_slidersPlayback); if (m_slidersCapture.count() > 0) volumeChangeInternal(m_mixdevice->captureVolume(), m_slidersCapture); m_mixdevice->mixer()->commitVolumeChange(m_mixdevice); @@ -853,7 +853,7 @@ { QAbstractSlider* firstSlider = ref_sliders.first(); long firstVolume = firstSlider->value(); - kDebug(67100) << "firstVolume=" <id() == "Headphone:0" ) +// debugMe =true; +// if (debugMe) +// kDebug(67100) << ( decrease ? "decrease by " : "increase by " ) << inc ; if ( !decrease && m_mixdevice->isMuted()) { // increasing form muted state: unmute and start with a low volume level m_mixdevice->setMuted(false); --- trunk/KDE/kdemultimedia/kmix/gui/viewbase.cpp #1257960:1257961 @@ -258,7 +258,7 @@ _mixers.clear(); foreach ( MixDevice* md, *_mixSet ) { - kDebug() << "VVV Add to " << md->mixer()->id(); +// kDebug() << "VVV Add to " << md->mixer()->id(); // MixDeviceWidget* mdw = qobject_cast(qw); _mixers.insert(md->mixer()); } --- trunk/KDE/kdemultimedia/kmix/gui/viewdockareapopup.cpp #1257960:1257961 @@ -135,7 +135,7 @@ _layoutMDW->addItem( new QSpacerItem( 5, 20 ), sliderColumn,0 ); _layoutMDW->addWidget( mdw, sliderColumn+1,0 ); - kDebug(67100) << "ADDED " << md->id() << " at column " << sliderColumn; + //kDebug(67100) << "ADDED " << md->id() << " at column " << sliderColumn; return mdw; } @@ -154,7 +154,7 @@ void ViewDockAreaPopup::refreshVolumeLevels() { foreach ( QWidget* qw, _mdws ) { - kDebug() << "rvl: " << qw; + //kDebug() << "rvl: " << qw; MixDeviceWidget* mdw = qobject_cast(qw); if ( mdw != 0 ) mdw->update(); }