-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index 59e06a6..abbe5c8 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -195,3 +195,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
195 | qDebug("creating new audio device"); | 195 | qDebug("creating new audio device"); |
196 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; | 196 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; |
197 | d = new AudioDevicePrivate; | 197 | d = new AudioDevicePrivate; |
@@ -247,2 +247,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
247 | } | 247 | } |
248 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | ||
248 | 249 | ||
@@ -259,3 +260,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
259 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); | 260 | //if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" ); |
260 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | ||
261 | 261 | ||
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index 54e7ceb..b96b1ef 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -78,3 +78,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
78 | controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls"); | 78 | controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls"); |
79 | animatedPix=cfg.readEntry( "animatedPix", "opieplayer/animatedButton"); | 79 | // animatedPix=cfg.readEntry( "animatedPix", "opieplayer/animatedButton"); |
80 | 80 | ||
@@ -84,3 +84,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
84 | pixmaps[2] = new QPixmap( Resource::loadPixmap( controlsPix ) ); | 84 | pixmaps[2] = new QPixmap( Resource::loadPixmap( controlsPix ) ); |
85 | pixmaps[3] = new QPixmap( Resource::loadPixmap( animatedPix) ); | 85 | // pixmaps[3] = new QPixmap( Resource::loadPixmap( animatedPix) ); |
86 | 86 | ||
@@ -122,3 +122,3 @@ AudioWidget::~AudioWidget() { | |||
122 | mediaPlayerState->isStreaming = FALSE; | 122 | mediaPlayerState->isStreaming = FALSE; |
123 | for ( int i = 0; i < 4; i++ ) | 123 | for ( int i = 0; i < 3; i++ ) |
124 | delete pixmaps[i]; | 124 | delete pixmaps[i]; |
@@ -222,8 +222,8 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
222 | frame = frame >= 7 ? 0 : frame + 1; | 222 | frame = frame >= 7 ? 0 : frame + 1; |
223 | int x = audioButtons[AudioPlay].xPos; | 223 | // int x = audioButtons[AudioPlay].xPos; |
224 | int y = audioButtons[AudioPlay].yPos; | 224 | // int y = audioButtons[AudioPlay].yPos; |
225 | QPainter p( this ); | 225 | // QPainter p( this ); |
226 | // Optimize to only draw the little bit of the changing images which is different | 226 | // // Optimize to only draw the little bit of the changing images which is different |
227 | p.drawPixmap( x + 14, y + 8, *pixmaps[3], 32 * frame, 0, 32, 32 ); | 227 | // p.drawPixmap( x + 14, y + 8, *pixmaps[3], 32 * frame, 0, 32, 32 ); |
228 | p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 ); | 228 | // p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 ); |
229 | } | 229 | } |