9 files changed, 234 insertions, 91 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index 5fef792..2087c7f 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -199,3 +199,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     else format = AFMT_S16_LE;
-
     qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
@@ -203,3 +202,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
 
-
     int fragments = 0x10000 * 8 + sound_fragment_shift;
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 582660c..3901446 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -19,2 +19,5 @@
 **********************************************************************/
+#include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
+
 #include <qwidget.h>
@@ -24,3 +27,3 @@
 #include <qframe.h>
-#include <qpe/resource.h>
+
 #include "audiowidget.h"
@@ -62,2 +65,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 {
+//    QPEApplication::grabKeyboard();
     setCaption( tr("OpiePlayer") );
@@ -218,2 +222,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
     toggleButton(i);
+                qDebug("button toggled %d",i);
     switch (i) {
@@ -276 +281,56 @@ void AudioWidget::paintEvent( QPaintEvent * ) {
 
+void AudioWidget::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
+          break;
+      case Key_F13: //mail
+          break;
+      case Key_Space: {
+          if(mediaPlayerState->playing()) {
+//                toggleButton(1);
+              mediaPlayerState->setPlaying(FALSE);
+//                toggleButton(1);
+          } else {
+//                toggleButton(0);
+              mediaPlayerState->setPlaying(TRUE);
+//                toggleButton(0);
+          }
+      }
+          break;
+      case Key_Down:
+            toggleButton(6);
+          emit lessClicked();
+          emit lessReleased();
+          toggleButton(6);
+          break;
+      case Key_Up:
+           toggleButton(5);
+           emit moreClicked();
+           emit moreReleased();
+           toggleButton(5);
+           break;
+      case Key_Right:
+//            toggleButton(3);
+          mediaPlayerState->setNext();
+//            toggleButton(3);
+          break;
+      case Key_Left:
+//            toggleButton(4);
+          mediaPlayerState->setPrev();
+//            toggleButton(4);
+          break;
+      case Key_Escape:
+          break;
+        
+    };
+}
diff --git a/core/multimedia/opieplayer/audiowidget.h b/core/multimedia/opieplayer/audiowidget.h
index 53e84b3..a2850aa 100644
--- a/core/multimedia/opieplayer/audiowidget.h
+++ b/core/multimedia/opieplayer/audiowidget.h
@@ -130,2 +130,3 @@ protected:
     void closeEvent( QCloseEvent *event );
+    void keyReleaseEvent( QKeyEvent *e);
 
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index cb8de8a..4b2827e 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -223,3 +223,2 @@ void LoopControl::startAudio() {
     
-//qDebug("start audio");
     audioMutex->lock();
@@ -243,3 +242,3 @@ void LoopControl::startAudio() {
 //       else if ( sampleWaitTime <= -5000 ) {
-//      qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+//    //      qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
 //      //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
@@ -381,3 +380,3 @@ bool LoopControl::init( const QString& filename ) {
   channels = mediaPlayerState->curDecoder()->audioChannels( astream );
-  qDebug( "LC- channels = %d", channels );
+//   qDebug( "LC- channels = %d", channels );
   
@@ -391,3 +390,3 @@ bool LoopControl::init( const QString& filename ) {
   freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-  qDebug( "LC- frequency = %d", freq );
+//    qDebug( "LC- frequency = %d", freq );
 
@@ -395,7 +394,9 @@ bool LoopControl::init( const QString& filename ) {
    int bits_per_sample;
-   if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
+   if ( mediaPlayerState->curDecoder()->pluginName() == QString("WavPlugin") ) {
        bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
-       qDebug("using stupid hack");
+//         qDebug("using stupid hack");
    } else {
            bits_per_sample=0;
+//       freq=44100;
+       channels=2;
    }
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp
index 4019d12..47fc731 100644
--- a/core/multimedia/opieplayer/playlistselection.cpp
+++ b/core/multimedia/opieplayer/playlistselection.cpp
@@ -57,3 +57,3 @@ PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
 
-//    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
+    setBackgroundPixmap( Resource::loadPixmap( "opielogo" ) );
 // #endif
@@ -75,6 +75,5 @@ void PlayListSelection::drawBackground( QPainter *p, const QRect &r ) {
    p->fillRect( r, QBrush( white ) );
-//      QImage logo = Resource::loadImage( "mpegplayer/background" );
-//  //      QImage logo = Resource::loadImage( "opielogo" );
-//        if ( !logo.isNull() )
-//      p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
+      QImage logo = Resource::loadImage( "opielogo" );
+        if ( !logo.isNull() )
+      p->drawImage( (width() - logo.width()) / 2, (height() - logo.height()) / 2, logo );
 }
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 9969526..524747e 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -107,2 +107,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     d->current = NULL;
+    fromSetDocument = FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
@@ -176,6 +177,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     pTab = new QWidget( tabWidget, "pTab" );
-    playlistView = new QListView( pTab, "Videoview" );
-    playlistView->setMinimumSize(236,260);
+//      playlistView = new QListView( pTab, "playlistview" );
+//    playlistView->setMinimumSize(236,260);
     tabWidget->insertTab( pTab,"Playlist");
 
+
     // Add the playlist area
@@ -191,2 +193,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
+    QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
+          connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+                   this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
+
+          
      QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
@@ -206,3 +213,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     audioView->setColumnAlignment(2, Qt::AlignRight);
+    audioView->setAllColumnsShowFocus(TRUE);
     tabWidget->insertTab(aTab,"Audio");
+
+    QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
+    connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+             this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
+    
+
 //    audioView
@@ -234,2 +248,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     videoView->setColumnAlignment(2, Qt::AlignRight);
+    videoView->setAllColumnsShowFocus(TRUE);
+    QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
+    connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+             this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
 
@@ -263,4 +281,2 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 // add the library area
-   QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
-
 
@@ -421,2 +437,3 @@ void PlayListWidget::addAllVideoToList() {
 void PlayListWidget::setDocument(const QString& fileref) {
+    fromSetDocument = TRUE;
     if ( fileref.isNull() ) {
@@ -425,7 +442,7 @@ void PlayListWidget::setDocument(const QString& fileref) {
     }
-//    qDebug("setDocument");
+//    qDebug("setDocument "+fileref);
     if(fileref.find("playlist",0,TRUE) == -1) {
+        clearList();
     addToSelection( DocLnk( fileref ) );
     d->setDocumentUsed = TRUE;
-    qApp->processEvents();
     mediaPlayerState->setPlaying( FALSE );
@@ -433,9 +450,9 @@ void PlayListWidget::setDocument(const QString& fileref) {
     mediaPlayerState->setPlaying( TRUE );
-    d->selectedFiles->removeSelected( );
-    } else {
+        qApp->processEvents();
+        setCaption("OpiePlayer");
+
+    } else { //is playlist
+        clearList();
         loadList(DocLnk(fileref));
         d->selectedFiles->first();
-//      mediaPlayerState->setPlaying( TRUE );
-//      mediaPlayerState->setPlaying( FALSE );
-
     }
@@ -457,5 +474,19 @@ void PlayListWidget::useSelectedDocument() {
 
-const DocLnk *PlayListWidget::current() {
+const DocLnk *PlayListWidget::current() { // this is fugly
 
-//    qDebug("in Playlist  widget ::current");
+//      if( fromSetDocument) {
+//          qDebug("from setDoc");
+//          DocLnkSet files;
+//          Global::findDocuments(&files, "video/*;audio/*");
+//          QListIterator<DocLnk> dit( files.children() );
+//          for ( ; dit.current(); ++dit ) {
+//              if(dit.current()->linkFile() ==  setDocFileRef) {
+//                  qDebug(setDocFileRef);  
+//                  return dit;
+//              }
+//          }
+//      } else
+        switch (tabWidget->currentPageIndex()) {
+          case 0: //playlist
+          {
     if ( mediaPlayerState->playlist() ) {
@@ -469,3 +500,23 @@ const DocLnk *PlayListWidget::current() {
 }
-
+          break;
+          case 1: { //audio
+              Global::findDocuments(&files, "audio/*");
+              QListIterator<DocLnk> dit( files.children() );
+              for ( ; dit.current(); ++dit ) {
+                  if( dit.current()->name() == audioView->currentItem()->text(0))
+                      return dit;
+              }
+          }           
+              break;
+          case 2: { // video
+              Global::findDocuments(&vFiles, "video/*");
+              QListIterator<DocLnk> Vdit( vFiles.children() );
+              for ( ; Vdit.current(); ++Vdit ) {
+                  if( Vdit.current()->name() == videoView->currentItem()->text(0))
+                      return Vdit;
+              }      
+          }
+              break;
+        };
+}
 
@@ -571,6 +622,4 @@ void PlayListWidget::saveList() {
         delete fileDlg;
-
 }
 
-
 void PlayListWidget::loadList( const DocLnk & lnk) {
@@ -591,3 +640,2 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
 
-
 void PlayListWidget::setPlaylist( bool shown ) {
@@ -599,3 +647,2 @@ void PlayListWidget::setPlaylist( bool shown ) {
 
-
 void PlayListWidget::setView( char view ) {
@@ -706,60 +753,36 @@ void PlayListWidget::tabChanged(QWidget *widg) {
 
-/*
-  list is right clicked*/
-void PlayListWidget::fauxPlay(QListViewItem *it) {
 
-    switch (tabWidget->currentPageIndex()) {
-      case 0: //playlist
-          break;
-      case 1: { //audio
-          QListIterator<DocLnk> dit( files.children() );
-          for ( ; dit.current(); ++dit ) {
-//               qDebug(dit.current()->name());
-              if( dit.current()->name() == it->text(0)) {
-                  d->selectedFiles->addToSelection(  **dit );
-              }
-          }
+/*
+  play button is pressed*/
+void PlayListWidget::btnPlay(bool b) {
+    mediaPlayerState->setPlaying(b);
       }           
+
+void PlayListWidget::deletePlaylist() {
+    switch( QMessageBox::information( this, (tr("Remove Playlist?")),
+                                      (tr("You really want to delete\nthis playlist?")),
+                                      (tr("Yes")), (tr("No")), 0 )){
+        case 0: // Yes clicked,
+            QFile().remove(playLists->selected()->file());
+            QFile().remove(playLists->selected()->linkFile());
+            playLists->reread();
           break;
-      case 2: { // video
-          QListIterator<DocLnk> dit( vFiles.children() );
-          for ( ; dit.current(); ++dit ) {
-//               qDebug(dit.current()->name());
-              if( dit.current()->name() == it->text(0)) {
-                  d->selectedFiles->addToSelection(  **dit );
-              }
-          }
-      }
+        case 1: // Cancel
           break;
     };
-    mediaPlayerState->setPlaying( TRUE );
-//  tabWidget->setCurrentPage(0);
-    d->selectedFiles->removeSelected();
+
 }
 
-/*
-  play button is pressed*/
-void PlayListWidget::btnPlay(bool b) { // this is fugly
-    switch ( tabWidget->currentPageIndex()) {
-      case 0:
+void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
       {
-          mediaPlayerState->setPlaying(b);
-      }
-      break;
+    switch (mouse) {
       case 1:
-      {
-          addToSelection( audioView->selectedItem() );
-          mediaPlayerState->setPlaying(b);
-          qApp->processEvents();
-          d->selectedFiles->removeSelected( );
-          tabWidget->setCurrentPage(1);
-      }
       break;
-      case 2:
-      {
-          addToSelection( videoView->selectedItem() );
-          mediaPlayerState->setPlaying(b);
-          qApp->processEvents();
-          d->selectedFiles->removeSelected( );
-          tabWidget->setCurrentPage(2);
+      case 2:{
+    QPopupMenu  m;
+    m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
+    m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
+//      m.insertSeparator();
+//      m.insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
+    m.exec( QCursor::pos() );
       }
@@ -770,12 +793,19 @@ void PlayListWidget::btnPlay(bool b) { // this is fugly
 
-void PlayListWidget::deletePlaylist() {
-    switch( QMessageBox::information( this, (tr("Remove Playlist?")),
-                                      (tr("You really want to delete\nthis playlist?")),
-                                      (tr("Yes")), (tr("No")), 0 )){
-        case 0: // Yes clicked,
-            QFile().remove(playLists->selected()->file());
-            QFile().remove(playLists->selected()->linkFile());
-            playLists->reread();
+void PlayListWidget::playSelected()
+{
+    btnPlay( TRUE);
+}
+
+void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
+{
+ switch (mouse) {
+      case 1:
             break;
-        case 1: // Cancel
+      case 2:{
+    QPopupMenu  m;
+    m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
+    m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
+//      m.insertSeparator();
+    m.exec( QCursor::pos() );
+      }
             break;
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index e72551b..effc600 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -50,2 +50,4 @@ public:
      QLabel *libString; 
+    bool fromSetDocument;
+    QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
@@ -70,3 +72,3 @@ public slots:
     void playIt( QListViewItem *);
-    void fauxPlay(QListViewItem *);
+
     void btnPlay(bool);
@@ -80,2 +82,5 @@ public slots:
     void tabChanged(QWidget*);
+    void viewPressed( int, QListViewItem *, const QPoint&, int);
+    void playlistViewPressed( int, QListViewItem *, const QPoint&, int);
+    void playSelected();
 /*     void setFullScreen(); */
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index be838c4..bb5f9e8 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -229,3 +229,3 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
   makeVisible();
-    } else { 
+ 
   mouseMoveEvent( event );
@@ -423 +423,49 @@ bool VideoWidget::playVideo() {
 
+
+void VideoWidget::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
+          break;
+      case Key_F13: //mail
+          break;
+      case Key_Space: {
+          if(mediaPlayerState->playing()) {
+              mediaPlayerState->setPlaying(FALSE);
+          } else {
+              mediaPlayerState->setPlaying(TRUE);
+          }
+      }
+          break;
+      case Key_Down:
+//            toggleButton(6);
+//            emit lessClicked();
+//            emit lessReleased();
+//            toggleButton(6);
+          break;
+      case Key_Up:
+//             toggleButton(5);
+//             emit moreClicked();
+//             emit moreReleased();
+//             toggleButton(5);
+           break;
+      case Key_Right:
+          mediaPlayerState->setNext();
+          break;
+      case Key_Left:
+          mediaPlayerState->setPrev();
+          break;
+      case Key_Escape:
+          break;
+        
+    };
+}
diff --git a/core/multimedia/opieplayer/videowidget.h b/core/multimedia/opieplayer/videowidget.h
index cf13743..fe56ca1 100644
--- a/core/multimedia/opieplayer/videowidget.h
+++ b/core/multimedia/opieplayer/videowidget.h
@@ -69,2 +69,3 @@ protected:
     void closeEvent( QCloseEvent *event );
+    void keyReleaseEvent( QKeyEvent *e);