[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/kmix/gui
From:       Christian Esken <esken () kde ! org>
Date:       2011-09-02 19:51:06
Message-ID: 20110902195106.10ECAAC87C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1251004 by esken:

Cleanup

 M  +6 -6      mdwslider.cpp  
 M  +1 -1      mdwslider.h  


--- trunk/KDE/kdemultimedia/kmix/gui/mdwslider.cpp #1251003:1251004
@@ -272,7 +272,7 @@
     bool wantsPlaybackSliders = includePlayback && ( \
                m_mixdevice->playbackVolume().count() > 0 );
     bool wantsCaptureSliders  = includeCapture && ( \
                m_mixdevice->captureVolume().count() > 0 );
       bool hasVolumeSliders = wantsPlaybackSliders || wantsCaptureSliders;
-      bool bothCaptureANDPlaybackExist = wantsPlaybackSliders && \
wantsCaptureSliders; +     // bool bothCaptureANDPlaybackExist = wantsPlaybackSliders \
&& wantsCaptureSliders;  
       bool wantsMediaControls = ( m_mixdevice->hasMediaNextControl() || \
m_mixdevice->hasMediaPlayControl() || m_mixdevice->hasMediaPrevControl() );  
@@ -327,9 +327,9 @@
 		if ( hasVolumeSliders )
 		{
 			if ( wantsPlaybackSliders )
-				addSliders( volLayout, 'p', bothCaptureANDPlaybackExist, \
m_mixdevice->playbackVolume(), m_slidersPlayback); +				addSliders( volLayout, 'p', \
m_mixdevice->playbackVolume(), m_slidersPlayback);  if ( wantsCaptureSliders )
-				addSliders( volLayout, 'c', bothCaptureANDPlaybackExist, \
m_mixdevice->captureVolume() , m_slidersCapture ); +				addSliders( volLayout, 'c', \
m_mixdevice->captureVolume() , m_slidersCapture );  if ( wantsMediaControls )
 				addMediaControls( volLayout ); // Please note that the addmediaControls() is in \
the hasVolumeSliders check onyl because it was easier to integrate  \
controlLayout->addSpacing( 3 ); @@ -430,9 +430,9 @@
 		if ( hasVolumeSliders )
 		{
 			if ( wantsPlaybackSliders && m_mixdevice->playbackVolume().count() > 0 )
-				addSliders( volLayout, 'p', false, m_mixdevice->playbackVolume(), \
m_slidersPlayback ); +				addSliders( volLayout, 'p', m_mixdevice->playbackVolume(), \
m_slidersPlayback );  if ( wantsCaptureSliders && \
                m_mixdevice->captureVolume().count() > 0 )
-				addSliders( volLayout, 'c', bothCaptureANDPlaybackExist, \
m_mixdevice->captureVolume() , m_slidersCapture ); +				addSliders( volLayout, 'c', \
m_mixdevice->captureVolume() , m_slidersCapture );  if ( wantsMediaControls )
 				addMediaControls( volLayout );
 		}
@@ -521,7 +521,7 @@
   mixDevice()->mediaPlay();
 }
 
-void MDWSlider::addSliders( QBoxLayout *volLayout, char type, bool \
forceCaptureLabel, Volume& vol, QList<QAbstractSlider *>& ref_sliders) +void \
MDWSlider::addSliders( QBoxLayout *volLayout, char type, Volume& vol, \
QList<QAbstractSlider *>& ref_sliders)  {
 	const int minSliderSize = fontMetrics().height() * 10;
 	long minvol = vol.minVolume();
--- trunk/KDE/kdemultimedia/kmix/gui/mdwslider.h #1251003:1251004
@@ -129,7 +129,7 @@
     void setIcon( QString iconname );
     QPixmap loadIcon( QString filename );
     void createWidgets( bool showMuteLED, bool showCaptureLED );
-    void addSliders( QBoxLayout *volLayout, char type, bool addLabel, Volume& vol, \
QList<QAbstractSlider *>& ref_sliders); +    void addSliders( QBoxLayout *volLayout, \
                char type, Volume& vol, QList<QAbstractSlider *>& ref_sliders);
     //void addDefaultLabel(QBoxLayout *layout, Qt::Orientation orientation);
 
     // Methods that are called two times from a wrapper. Once for playabck, once for \
capture


[prev in list] [next in list] [prev in thread] [next in thread]