Diffstat (limited to 'core/multimedia/opieplayer/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index a1973e9..b187cb4 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp @@ -77,5 +77,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : { setCaption( tr("OpiePlayer") ); - qDebug("<<<<<audioWidget"); + // qDebug("<<<<<audioWidget"); Config cfg("OpiePlayer"); @@ -91,5 +91,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : skinPath = "opieplayer2/skins/default"; - qDebug("skin path " + skinPath); + // qDebug("skin path " + skinPath); pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); @@ -161,20 +161,21 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : // setPaused( mediaPlayerState->paused() ); setPlaying( mediaPlayerState->playing() ); - +this->setFocus(); } AudioWidget::~AudioWidget() { + // setPlaying( false); for ( int i = 0; i < 10; i++ ) { - delete buttonPixUp[i]; - delete buttonPixDown[i]; + if(buttonPixUp[i]) delete buttonPixUp[i]; + if(buttonPixDown[i]) delete buttonPixDown[i]; } - delete pixBg; - delete imgUp; - delete imgDn; - delete imgButtonMask; + if(pixBg) delete pixBg; + if(imgUp) delete imgUp; + if(imgDn) delete imgDn; + if(imgButtonMask) delete imgButtonMask; for ( int i = 0; i < 10; i++ ) { - delete masks[i]; + if(masks[i]) delete masks[i]; } } @@ -280,4 +281,5 @@ void AudioWidget::setView( char view ) { hide(); } + } @@ -291,5 +293,6 @@ static QString timeAsString( long length ) { void AudioWidget::updateSlider( long i, long max ) { - time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); +this->setFocus(); + time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); if ( max == 0 ) @@ -358,6 +361,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 ); - if ( isOnButton && i == AudioVolumeUp ) - qDebug("on up"); +// if ( isOnButton && i == AudioVolumeUp ) +// qDebug("on up"); if ( isOnButton && !audioButtons[i].isHeld ) { @@ -366,9 +369,9 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { switch (i) { case AudioVolumeUp: - qDebug("more clicked"); + // qDebug("more clicked"); emit moreClicked(); return; case AudioVolumeDown: - qDebug("less clicked"); + // qDebug("less clicked"); emit lessClicked(); return; |