7 files changed, 58 insertions, 65 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 442864f..56203e0 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -527,24 +527,25 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
           break;
       case Key_F9: //activity
            hide();
 //           qDebug("Audio F9");
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
+          mediaPlayerState->toggleBlank();
           break;
       case Key_Space: {
           if(mediaPlayerState->playing()) {
 //                toggleButton(1);
               mediaPlayerState->setPlaying(FALSE);
 //                toggleButton(1);
           } else {
 //                toggleButton(0);
               mediaPlayerState->setPlaying(TRUE);
 //                toggleButton(0);
           }
       }
@@ -570,19 +571,19 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
 //            toggleButton(4);
           mediaPlayerState->setPrev();
 //            toggleButton(4);
           break;
       case Key_Escape: {
 #if defined(QT_QWS_IPAQ)
           if( mediaPlayerState->isPaused ) {
               setToggleButton( i, FALSE );
               mediaPlayerState->setPaused( FALSE );
           } else if( !mediaPlayerState->isPaused ) {
               setToggleButton( i, TRUE );
               mediaPlayerState->setPaused( TRUE );
-          }           
+          }
 #endif
       }
           break;
 
     };
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 8dadf96..858b51f 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -1,86 +1,91 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/qlibrary.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
+#include <qpe/qcopenvelope_qws.h>
 
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qwidgetstack.h>
 #include <qfile.h>
 
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "volumecontrol.h"
 
 #include "mediaplayerstate.h"
 
+// for setBacklight()
+#include <linux/fb.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
 
 
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern PlayListWidget *playList;
 extern MediaPlayerState *mediaPlayerState;
 
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
 
 
-    xineControl = new XineControl();
+    //   xineControl = new XineControl();
 //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
 
     connect( mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
     connect( mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
+    connect( mediaPlayerState, SIGNAL( blankToggled( bool ) ), this, SLOT ( blank( bool ) ) );
 
     connect( audioUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( audioUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( audioUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     connect( videoUI,  SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
     connect( videoUI,  SIGNAL( lessClicked() ),  this, SLOT( startDecreasingVolume() ) );
     connect( videoUI,  SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
     connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
     volControl = new VolumeControl;
-
+    xineControl = new XineControl();
 }
 
 MediaPlayer::~MediaPlayer() {
     delete xineControl;
     delete volControl;
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
      if ( b && !mediaPlayerState->playing() ) {
          mediaPlayerState->setPaused( FALSE );
      }
 }
 
 void MediaPlayer::play() {
         mediaPlayerState->setPlaying( FALSE );
         mediaPlayerState->setPlaying( TRUE );
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
-        // mediaPlayerState->setPaused( FALSE );
         return;
     }
 
      if ( mediaPlayerState->paused() ) {
          mediaPlayerState->setPaused( FALSE );
          return;
      }
 
     const DocLnk *playListCurrent = playList->current();
     if ( playListCurrent != NULL ) {
         currentFile = playListCurrent;
     }
@@ -89,30 +94,24 @@ void MediaPlayer::setPlaying( bool play ) {
 
     xineControl->length();
     long seconds =  mediaPlayerState->length();//
     QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
     qDebug(time);
 
     QString tickerText;
     if( currentFile->file().left(4) == "http" )
      tickerText= tr( " File: " ) + currentFile->name();
     else
     tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time;
 
-//     QString fileInfo = mediaPlayerState->curDecoder()->fileInfo();
-
-//     if ( !fileInfo.isEmpty() )
-//         tickerText += ", " + fileInfo;
-//     audioUI->setTickerText( tickerText + "." );
-
     audioUI->setTickerText( currentFile->file( ) );
 
 }
 
 
 void MediaPlayer::prev() {
     if ( playList->prev() ) {
         play();
     } else if ( mediaPlayerState->looping() ) {
         if ( playList->last() ) {
             play();
         }
@@ -240,44 +239,56 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
         p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") );
 
         for ( unsigned int i = 0; i < 10; i++ ) {
             if ( v > i ) {
                 p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 );
             } else {
                 p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 );
             }
         }
     }
 }
 
+
+void MediaPlayer::blank( bool b ) {
+    fd=open("/dev/fb0",O_RDWR);
+    if (fd != -1) {
+
+        if ( !b ) {
+            qDebug("do blanking");
+            ioctl( fd, FBIOBLANK, 3 );
+            isBlanked = TRUE;
+        } else {
+            qDebug("do unblanking");
+            ioctl( fd, FBIOBLANK, 0);
+            isBlanked = FALSE;
+        }
+        close( fd );
+    }
+}
+
 void MediaPlayer::keyReleaseEvent( QKeyEvent *e) {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           qDebug("Blank here");
+//          mediaPlayerState->toggleBlank();
           break;
       case Key_F13: //mail
-          break;
+          qDebug("Blank here");
+//           mediaPlayerState->toggleBlank();
+           break;
     }
 }
 
-void MediaPlayer::doBlank() {
-
-}
-
-void MediaPlayer::doUnblank() {
-
-}
-
 void MediaPlayer::cleanUp() {
 //     QPEApplication::grabKeyboard();
 //     QPEApplication::ungrabKeyboard();
-
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 16213b5..81fab88 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -19,28 +19,29 @@ public:
     ~MediaPlayer();
 
 private slots:
     void setPlaying( bool );
     void pauseCheck( bool );
     void play();
     void next();
     void prev();
     void startIncreasingVolume();
     void startDecreasingVolume();
     void stopChangingVolume();
     void cleanUp();
+    void blank( bool );
 
 protected:
     void timerEvent( QTimerEvent *e );
     void keyReleaseEvent( QKeyEvent *e);
-    void doBlank();
-    void doUnblank();
 private:
+    bool isBlanked;
+    int fd;
     int     volumeDirection;
     const DocLnk  *currentFile;
     XineControl *xineControl;
     VolumeControl *volControl;
 };
 
 
 #endif // MEDIA_PLAYER_H
 
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index bb8d905..6aafb88 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -106,33 +106,42 @@ char MediaPlayerState::view() {
 }
 
 // slots
 void MediaPlayerState::setIsStreaming( bool b ) {
 
     if ( isStreaming == b ) {
         return;
     }
     isStreaming = b;
 }
 
 
-void MediaPlayerState::setFullscreen( bool b ) {
+void MediaPlayerState::setBlank( bool b ) {
     if ( isFullscreen == b ) {
         return;
     }
     isFullscreen = b;
     emit fullscreenToggled(b);
 }
 
 
+void MediaPlayerState::setFullscreen( bool b ) {
+    if ( isBlanked == b ) {
+        return;
+    }
+    isBlanked = b;
+    emit blankToggled(b);
+}
+
+
 void MediaPlayerState::setScaled( bool b ) {
     if ( isScaled == b ) {
         return;
     }
     isScaled = b;
     emit scaledToggled(b);
 }
 
 void MediaPlayerState::setLooping( bool b ) {
     if ( isLooping    == b ) {
         return;
     }
@@ -248,22 +257,25 @@ void MediaPlayerState::toggleLooping() {
     setLooping( !isLooping);
 }
 
 void MediaPlayerState::toggleShuffled() {
     setShuffled( !isShuffled);
 }
 
 void MediaPlayerState::togglePlaylist() {
     setPlaylist( !usePlaylist);
 }
 
 void MediaPlayerState::togglePaused() {
- setPaused( !isPaused);
+    setPaused( !isPaused);
 }
 
 void MediaPlayerState::togglePlaying() {
     setPlaying( !isPlaying);
 }
 
+void MediaPlayerState::toggleBlank() {
+    setBlank( !isBlanked);
+}
 
 
 
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 887c527..3baffd3 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -69,60 +69,63 @@ public slots:
     void setFullscreen( bool b );
     void setScaled( bool b );
     void setLooping( bool b );
     void setShuffled( bool b );
     void setPlaylist( bool b );
     void setPaused( bool b );
     void setPlaying( bool b );
     void setStop( bool b );
     void setPosition( long p );
     void updatePosition( long p );
     void setLength( long l );
     void setView( char v );
+    void setBlank( bool b );
 
     void setPrev();
     void setNext();
     void setList();
     void setVideo();
     void setAudio();
 
     void toggleFullscreen();
     void toggleScaled();
     void toggleLooping();
     void toggleShuffled();
     void togglePlaylist();
     void togglePaused();
     void togglePlaying();
+    void toggleBlank();
 
 signals:
     void fullscreenToggled( bool );
     void scaledToggled( bool );
     void loopingToggled( bool );
     void shuffledToggled( bool );
     void playlistToggled( bool );
     void pausedToggled( bool );
     void playingToggled( bool );
     void stopToggled( bool );
     void positionChanged( long ); // When the slider is moved
     void positionUpdated( long ); // When the media file progresses
     void lengthChanged( long );
     void viewChanged( char );
-
+    void blankToggled( bool );
     void prev();
     void next();
 
 private:
     bool isStreaming;
     bool isFullscreen;
     bool isScaled;
+    bool isBlanked;
     bool isLooping;
     bool isShuffled;
     bool usePlaylist;
     long curPosition;
     long curLength;
     char curView;
 
     void readConfig( Config& cfg );
     void writeConfig( Config& cfg ) const;
 
 
 };
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 6dcc842..0cfd720 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -1,16 +1,14 @@
 
 #define QTOPIA_INTERNAL_FSLP
-#include <qpe/qcopenvelope_qws.h>
-
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/lnkproperties.h>
 #include <qpe/storage.h>
 
 #include <qpe/applnk.h>
 #include <qpopupmenu.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
@@ -36,35 +34,24 @@
 
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 
 #include "inputDialog.h"
 
 #include <stdlib.h>
 #include "audiowidget.h"
 #include "videowidget.h"
 
-#include <unistd.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/soundcard.h>
-
-// for setBacklight()
-#include <linux/fb.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern MediaPlayerState *mediaPlayerState;
 
 
 class PlayListWidgetPrivate {
 public:
     QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     FileSelector *files;
@@ -1001,25 +988,25 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 ////////////////////////////// Zaurus keys
       case Key_F9: //activity
 //           if(audioUI->isHidden())
 //             audioUI->showMaximized();
           break;
       case Key_F10: //contacts
 //           if( videoUI->isHidden())
 //             videoUI->showMaximized();
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
-//           doBlank();
+//          doBlank();
           break;
       case Key_F13: //mail
 //           doUnblank();
           break;
       case Key_Q: //add to playlist
           qDebug("Add");
           addSelected();
           break;
       case Key_R: //remove from playlist
           removeSelected();
           break;
 //       case Key_P: //play
@@ -1070,45 +1057,25 @@ void PlayListWidget::keyPressEvent( QKeyEvent *)
 //           break;
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //       case Key_Space:
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //     }
 }
 
-void PlayListWidget::doBlank() {
-    qDebug("do blanking");
-    fd=open("/dev/fb0",O_RDWR);
-    if (fd != -1) {
-        ioctl(fd,FBIOBLANK,1);
-//            close(fd);
-    }
-}
 
-void PlayListWidget::doUnblank() {
-    // this crashes opieplayer with a segfault
-    //      int fd;
-    //       fd=open("/dev/fb0",O_RDWR);
-    qDebug("do unblanking");
-    if (fd != -1) {
-        ioctl(fd,FBIOBLANK,0);
-        close(fd);
-    }
-    QCopEnvelope h("QPE/System", "setBacklight(int)");
-    h <<-3;// v[1]; // -3 Force on
-}
 
 void PlayListWidget::readm3u(const QString &filename) {
 
     qDebug("m3u filename is "+filename);
     QFile f(filename);
 
     if(f.open(IO_ReadOnly)) {
         QTextStream t(&f);
         QString s;//, first, second;
         int i=0;
         while ( !t.atEnd()) {
             s=t.readLine();
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 67a85a8..dd4bee0 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -33,55 +33,53 @@ public:
     QListView *audioView, *videoView, *playlistView;
     QLabel *libString;
     QPopupMenu *pmView ;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
 /*     QTimer    * menuTimer; */
     FileSelector*  playLists;
     QPushButton *tbDeletePlaylist;
-    int fd, selected;
+    int selected;
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
 /*     void setFullScreen(); */
 /*     void setScaled(); */
 protected:
 /*     void contentsMousePressEvent( QMouseEvent * e ); */
 /*     void contentsMouseReleaseEvent( QMouseEvent * e ); */
 void keyReleaseEvent( QKeyEvent *e);
 void keyPressEvent( QKeyEvent *e);
 private:
-    int defaultSkinIndex; 
-    QPopupMenu *skinsMenu; 
+    int defaultSkinIndex;
+    QPopupMenu *skinsMenu;
     bool audioScan, videoScan;
-    void doBlank();
-    void doUnblank();
     void readm3u(const QString &);
     void readPls(const QString &);
 
     void initializeStates();
     void readConfig( Config& cfg );
     void writeConfig( Config& cfg ) const;
     PlayListWidgetPrivate *d; // Private implementation data
     void populateAudioView();
     void populateVideoView();
 private slots:
     void populateSkinsMenu();
-    void skinsMenuActivated(int); 
+    void skinsMenuActivated(int);
     void pmViewActivated(int);
     void writem3u();
     void scanForAudio();
     void scanForVideo();
     void openFile();
     void setDocument( const QString& fileref );
     void addToSelection( const DocLnk& ); // Add a media file to the playlist
     void addToSelection( QListViewItem* ); // Add a media file to the playlist
     void setActiveWindow(); // need to handle this to show the right view
     void setPlaylist( bool ); // Show/Hide the playlist
     void setView( char );
     void clearList();