summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/mediaplayer.cpp
Unidiff
Diffstat (limited to 'core/multimedia/opieplayer/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/mediaplayer.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index 6c743ec..15f6928 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -20,6 +20,4 @@
20 20
21 21
22#include <qmessagebox.h>
23
24#include "mediaplayer.h" 22#include "mediaplayer.h"
25#include "playlistwidget.h" 23#include "playlistwidget.h"
@@ -27,7 +25,11 @@
27#include "loopcontrol.h" 25#include "loopcontrol.h"
28#include "audiodevice.h" 26#include "audiodevice.h"
29
30#include "mediaplayerstate.h" 27#include "mediaplayerstate.h"
31 28
29/* OPIE */
30#include <opie2/odebug.h>
31
32/* QT */
33#include <qmessagebox.h>
32 34
33extern AudioWidget *audioUI; 35extern AudioWidget *audioUI;
@@ -74,5 +76,5 @@ void MediaPlayer::play() {
74 76
75void MediaPlayer::setPlaying( bool play ) { 77void MediaPlayer::setPlaying( bool play ) {
76 // qDebug("MediaPlayer setPlaying %d", play); 78 // odebug << "MediaPlayer setPlaying " << play << "" << oendl;
77 if ( !play ) { 79 if ( !play ) {
78 mediaPlayerState->setPaused( FALSE ); 80 mediaPlayerState->setPaused( FALSE );
@@ -85,7 +87,7 @@ void MediaPlayer::setPlaying( bool play ) {
85 return; 87 return;
86 } 88 }
87 // qDebug("about to ctrash"); 89 // odebug << "about to ctrash" << oendl;
88 const DocLnk *playListCurrent = playList->current(); 90 const DocLnk *playListCurrent = playList->current();
89 91
90 if ( playListCurrent != NULL ) { 92 if ( playListCurrent != NULL ) {
91 loopControl->stop( TRUE ); 93 loopControl->stop( TRUE );
@@ -172,5 +174,5 @@ void MediaPlayer::startIncreasingVolume() {
172 startTimer( 100 ); 174 startTimer( 100 );
173 AudioDevice::increaseVolume(); 175 AudioDevice::increaseVolume();
174 176
175} 177}
176 178
@@ -192,5 +194,5 @@ void MediaPlayer::stopChangingVolume() {
192 194
193void MediaPlayer::timerEvent( QTimerEvent * ) { 195void MediaPlayer::timerEvent( QTimerEvent * ) {
194// qDebug("timer"); 196// odebug << "timer" << oendl;
195 if ( volumeDirection == +1 ) 197 if ( volumeDirection == +1 )
196 AudioDevice::increaseVolume(); 198 AudioDevice::increaseVolume();
@@ -204,5 +206,5 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
204 206
205 if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) { 207 if ( drawnOnScreenDisplay && onScreenDisplayVolume == v ) {
206// qDebug("returning %d, %d, %d, %d", v, l, r, m); 208// odebug << "returning " << v << ", " << l << ", " << r << ", " << m << "" << oendl;
207 return; 209 return;
208 } 210 }
@@ -231,7 +233,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
231 233
232 for ( unsigned int i = 0; i < 10; i++ ) { 234 for ( unsigned int i = 0; i < 10; i++ ) {
233 if ( v > i ) 235 if ( v > i )
234 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); 236 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
235 else 237 else
236 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); 238 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
237 } 239 }
@@ -250,5 +252,5 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
250 break; 252 break;
251 case Key_F12: //home 253 case Key_F12: //home
252 // qDebug("Blank here"); 254 // odebug << "Blank here" << oendl;
253 break; 255 break;
254 case Key_F13: //mail 256 case Key_F13: //mail