summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-29 05:31:39 (UTC)
committer llornkcor <llornkcor>2002-06-29 05:31:39 (UTC)
commit0252b90a4b2e7be6186518eaa12ea03ef26ae08c (patch) (side-by-side diff)
tree89ee92dbbe5475da4c527a9fb67fd1bb9ccb1b14
parent444ccb7e2adcb9b6690c6f9bba2c9185213e3ee7 (diff)
downloadopie-0252b90a4b2e7be6186518eaa12ea03ef26ae08c.zip
opie-0252b90a4b2e7be6186518eaa12ea03ef26ae08c.tar.gz
opie-0252b90a4b2e7be6186518eaa12ea03ef26ae08c.tar.bz2
take out resource intensive animated button, that I bet no one knew was there anyway.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp2
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp18
2 files changed, 10 insertions, 10 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
@@ -245,6 +245,7 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1)
perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
}
+// QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
d->bufferSize = sound_fragment_bytes;
d->unwrittenBuffer = new char[d->bufferSize];
@@ -257,7 +258,6 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
//if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" );
//if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" );
//if ( capabilities & DSP_CAP_MMAP ) qDebug( "Sound card can mmap" );
- // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
}
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
@@ -76,13 +76,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
buttonsAllPix=cfg.readEntry( "buttonsAllPix","opieplayer/mediaButtonsAll");
buttonsBigPix=cfg.readEntry( "buttonsBigPix","opieplayer/mediaButtonsBig");
controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls");
- animatedPix=cfg.readEntry( "animatedPix", "opieplayer/animatedButton");
+// animatedPix=cfg.readEntry( "animatedPix", "opieplayer/animatedButton");
setBackgroundPixmap( Resource::loadPixmap( backgroundPix) );
pixmaps[0] = new QPixmap( Resource::loadPixmap( buttonsAllPix ) );
pixmaps[1] = new QPixmap( Resource::loadPixmap( buttonsBigPix ) );
pixmaps[2] = new QPixmap( Resource::loadPixmap( controlsPix ) );
- pixmaps[3] = new QPixmap( Resource::loadPixmap( animatedPix) );
+// pixmaps[3] = new QPixmap( Resource::loadPixmap( animatedPix) );
songInfo = new Ticker( this );
songInfo->setFocusPolicy( QWidget::NoFocus );
@@ -120,7 +120,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
AudioWidget::~AudioWidget() {
mediaPlayerState->isStreaming = FALSE;
- for ( int i = 0; i < 4; i++ )
+ for ( int i = 0; i < 3; i++ )
delete pixmaps[i];
}
@@ -220,12 +220,12 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
static int frame = 0;
if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) {
frame = frame >= 7 ? 0 : frame + 1;
- int x = audioButtons[AudioPlay].xPos;
- int y = audioButtons[AudioPlay].yPos;
- QPainter p( this );
- // Optimize to only draw the little bit of the changing images which is different
- p.drawPixmap( x + 14, y + 8, *pixmaps[3], 32 * frame, 0, 32, 32 );
- p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 );
+// int x = audioButtons[AudioPlay].xPos;
+// int y = audioButtons[AudioPlay].yPos;
+// QPainter p( this );
+// // Optimize to only draw the little bit of the changing images which is different
+// p.drawPixmap( x + 14, y + 8, *pixmaps[3], 32 * frame, 0, 32, 32 );
+// p.drawPixmap( x + 37, y + 37, *pixmaps[2], 18 * AudioPlay, 0, 6, 3 );
}
}