summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/mediaplayer.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp50
1 files changed, 5 insertions, 45 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index e6afbd8..b8023ca 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -7,2 +7,3 @@
#include <opie2/odebug.h>
+#include <opie2/odevice.h>
#include <qpe/qpeapplication.h>
@@ -36,6 +37,2 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
connect( &mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
-
-// What is pauseCheck good for? (Simon)
-// connect( &mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pauseCheck(bool) ) );
-
connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
@@ -156,3 +153,3 @@ void MediaPlayer::next() {
} else { //if playing from file list, let's just stop
- odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl;
+ odebug << "<<<<<<<<<<<<<<<<<stop for filelists" << oendl;
mediaPlayerState.setPlaying(false);
@@ -283,38 +280,3 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
void MediaPlayer::blank( bool b ) {
-#ifdef QT_QWS_DEVFS
- fd=open("/dev/fb/0",O_RDWR);
-#else
- fd=open("/dev/fb0",O_RDWR);
-#endif
-#ifdef QT_QWS_SL5XXX
- fl= open( "/dev/fl", O_RDWR );
-#endif
- if (fd != -1) {
- if ( b ) {
- odebug << "do blanking" << oendl;
-#ifdef QT_QWS_SL5XXX
- ioctl( fd, FBIOBLANK, 1 );
- if(fl !=-1) {
- ioctl( fl, 2 );
- ::close(fl);
- }
-#else
- ioctl( fd, FBIOBLANK, 3 );
-#endif
- isBlanked = TRUE;
- } else {
- odebug << "do unblanking" << oendl;
- ioctl( fd, FBIOBLANK, 0);
-#ifdef QT_QWS_SL5XXX
- if(fl != -1) {
- ioctl( fl, 1);
- ::close(fl);
- }
-#endif
- isBlanked = FALSE;
- }
- close( fd );
- } else {
- odebug << "<< /dev/fb0 could not be opened >>" << oendl;
- }
+ Opie::Core::ODevice::inst()->setDisplayStatus( b );
}
@@ -333,3 +295,3 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
case Key_F12: //home
- odebug << "Blank here" << oendl;
+ odebug << "Blank here" << oendl;
// mediaPlayerState->toggleBlank();
@@ -337,3 +299,3 @@ void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
case Key_F13: //mail
- odebug << "Blank here" << oendl;
+ odebug << "Blank here" << oendl;
// mediaPlayerState->toggleBlank();
@@ -348,4 +310,2 @@ void MediaPlayer::cleanUp() {// this happens on closing
-// QPEApplication::grabKeyboard();
-// QPEApplication::ungrabKeyboard();
}