-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 | |||
@@ -190,13 +190,13 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume, | |||
190 | 190 | ||
191 | 191 | ||
192 | 192 | ||
193 | 193 | ||
194 | AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | 194 | 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; |
198 | d->frequency = f; | 198 | d->frequency = f; |
199 | d->channels = chs; | 199 | d->channels = chs; |
200 | d->bytesPerSample = bps; | 200 | d->bytesPerSample = bps; |
201 | qDebug("%d",bps); | 201 | qDebug("%d",bps); |
202 | int format=0; | 202 | int format=0; |
@@ -242,25 +242,25 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) { | |||
242 | qDebug("channels %d",d->channels); | 242 | qDebug("channels %d",d->channels); |
243 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { | 243 | if ( ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels ) == -1 ) { |
244 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; | 244 | d->channels = ( d->channels == 1 ) ? 2 : d->channels; |
245 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) | 245 | if(ioctl( d->handle, SNDCTL_DSP_CHANNELS, &d->channels )==-1) |
246 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); | 246 | perror("ioctl(\"SNDCTL_DSP_CHANNELS\")"); |
247 | } | 247 | } |
248 | // QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; | ||
248 | 249 | ||
249 | d->bufferSize = sound_fragment_bytes; | 250 | d->bufferSize = sound_fragment_bytes; |
250 | d->unwrittenBuffer = new char[d->bufferSize]; | 251 | d->unwrittenBuffer = new char[d->bufferSize]; |
251 | d->unwritten = 0; | 252 | d->unwritten = 0; |
252 | d->can_GETOSPACE = TRUE; // until we find otherwise | 253 | d->can_GETOSPACE = TRUE; // until we find otherwise |
253 | 254 | ||
254 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); | 255 | //if ( chs != d->channels ) qDebug( "Wanted %d, got %d channels", chs, d->channels ); |
255 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); | 256 | //if ( f != d->frequency ) qDebug( "wanted %dHz, got %dHz", f, d->frequency ); |
256 | //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); | 257 | //if ( capabilities & DSP_CAP_BATCH ) qDebug( "Sound card has local buffer" ); |
257 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); | 258 | //if ( capabilities & DSP_CAP_REALTIME )qDebug( "Sound card has realtime sync" ); |
258 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); | 259 | //if ( capabilities & DSP_CAP_TRIGGER ) qDebug( "Sound card has precise trigger" ); |
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 | ||
262 | } | 262 | } |
263 | 263 | ||
264 | 264 | ||
265 | AudioDevice::~AudioDevice() { | 265 | AudioDevice::~AudioDevice() { |
266 | qDebug("destryo audiodevice"); | 266 | qDebug("destryo audiodevice"); |
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 | |||
@@ -73,19 +73,19 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
73 | // layout->setMargin( 2); | 73 | // layout->setMargin( 2); |
74 | QString backgroundPix, buttonsAllPix, buttonsBigPix, controlsPix, animatedPix; | 74 | QString backgroundPix, buttonsAllPix, buttonsBigPix, controlsPix, animatedPix; |
75 | backgroundPix=cfg.readEntry( " backgroundPix", "opieplayer/metalFinish"); | 75 | backgroundPix=cfg.readEntry( " backgroundPix", "opieplayer/metalFinish"); |
76 | buttonsAllPix=cfg.readEntry( "buttonsAllPix","opieplayer/mediaButtonsAll"); | 76 | buttonsAllPix=cfg.readEntry( "buttonsAllPix","opieplayer/mediaButtonsAll"); |
77 | buttonsBigPix=cfg.readEntry( "buttonsBigPix","opieplayer/mediaButtonsBig"); | 77 | buttonsBigPix=cfg.readEntry( "buttonsBigPix","opieplayer/mediaButtonsBig"); |
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 | ||
81 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); | 81 | setBackgroundPixmap( Resource::loadPixmap( backgroundPix) ); |
82 | pixmaps[0] = new QPixmap( Resource::loadPixmap( buttonsAllPix ) ); | 82 | pixmaps[0] = new QPixmap( Resource::loadPixmap( buttonsAllPix ) ); |
83 | pixmaps[1] = new QPixmap( Resource::loadPixmap( buttonsBigPix ) ); | 83 | pixmaps[1] = new QPixmap( Resource::loadPixmap( buttonsBigPix ) ); |
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 | ||
87 | songInfo = new Ticker( this ); | 87 | songInfo = new Ticker( this ); |
88 | songInfo->setFocusPolicy( QWidget::NoFocus ); | 88 | songInfo->setFocusPolicy( QWidget::NoFocus ); |
89 | songInfo->setGeometry( QRect( 7, 3, 220, 20 ) ); | 89 | songInfo->setGeometry( QRect( 7, 3, 220, 20 ) ); |
90 | // layout->addMultiCellWidget( songInfo, 0, 0, 0, 2 ); | 90 | // layout->addMultiCellWidget( songInfo, 0, 0, 0, 2 ); |
91 | 91 | ||
@@ -117,13 +117,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
117 | 117 | ||
118 | } | 118 | } |
119 | 119 | ||
120 | 120 | ||
121 | AudioWidget::~AudioWidget() { | 121 | 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]; |
125 | } | 125 | } |
126 | 126 | ||
127 | 127 | ||
128 | static bool audioSliderBeingMoved = FALSE; | 128 | static bool audioSliderBeingMoved = FALSE; |
129 | 129 | ||
@@ -217,18 +217,18 @@ void AudioWidget::paintButton( QPainter *p, int i ) { | |||
217 | 217 | ||
218 | 218 | ||
219 | void AudioWidget::timerEvent( QTimerEvent * ) { | 219 | void AudioWidget::timerEvent( QTimerEvent * ) { |
220 | static int frame = 0; | 220 | static int frame = 0; |
221 | if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) { | 221 | if ( !mediaPlayerState->paused() && audioButtons[ AudioPlay ].isDown ) { |
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 | } |
230 | } | 230 | } |
231 | 231 | ||
232 | 232 | ||
233 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | 233 | void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { |
234 | for ( int i = 0; i < numButtons; i++ ) { | 234 | for ( int i = 0; i < numButtons; i++ ) { |