bugfix: menu select play works again

3 files changed, 14 insertions, 17 deletions

diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp
index e0989d0..3262e38 100644
--- a/core/multimedia/opieplayer/audiodevice.cpp
+++ b/core/multimedia/opieplayer/audiodevice.cpp
@@ -16,12 +16,13 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // L.J.Potter added better error code Fri 02-15-2002 14:37:47
 
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include "audiodevice.h"
 
@@ -185,12 +186,13 @@ void AudioDevice::setVolume( unsigned int leftVolume, unsigned int rightVolume,
 
 
 
 
 AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
   qDebug("creating new audio device");
+    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
   d = new AudioDevicePrivate;
     d->frequency = f;
     d->channels = chs;
     d->bytesPerSample = bps;
     qDebug("%d",bps);
     int format=0;
@@ -200,13 +202,12 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
     qDebug("AD- freq %d, channels %d, b/sample %d, bitrate %d",f,chs,bps,format);
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( volumeChanged(bool) ) );
 
     int fragments = 0x10000 * 8 + sound_fragment_shift;
     int capabilities = 0;
 
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE; 
     
 #ifdef KEEP_DEVICE_OPEN
     if ( AudioDevicePrivate::dspFd == 0 ) {
 #endif
     if ( ( d->handle = ::open( "/dev/dsp", O_WRONLY ) ) < 0 ) {
         perror("open(\"/dev/dsp\") sending to /dev/null instead");
@@ -261,13 +262,12 @@ AudioDevice::~AudioDevice() {
 # ifndef KEEP_DEVICE_OPEN 
     close( d->handle );     // Now it should be safe to shut the handle
 # endif
     delete d->unwrittenBuffer;
     delete d;
 #endif
-    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE; 
     
 }
 
 
 void AudioDevice::volumeChanged( bool muted )
 {
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 930560e..d7447b7 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -837,35 +837,31 @@ void PlayListWidget::btnPlay(bool b) {
       {
           mediaPlayerState->setPlaying(b);
       }
       break;
       case 1:
       {
-//           if(audioView->selectedItem()) {
-          addToSelection( audioView->selectedItem() );
+          addToSelection( audioView->currentItem() );
           mediaPlayerState->setPlaying(b);
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(1);
           d->selectedFiles->unSelect();
           insanityBool=FALSE;         
 //          audioView->clearSelection();
-//           }
       }
       break;
       case 2:
       {
-//           if(videoView->selectedItem() ) {
-          addToSelection( videoView->selectedItem() );
+          addToSelection( videoView->currentItem() );
           mediaPlayerState->setPlaying(b);
           qApp->processEvents();
           d->selectedFiles->removeSelected( );
           tabWidget->setCurrentPage(2);
           d->selectedFiles->unSelect();
           insanityBool=FALSE;
 //          videoView->clearSelection();
-//           }
       }
       break;
     };
 }
 
 void PlayListWidget::deletePlaylist() {
@@ -885,22 +881,23 @@ void PlayListWidget::deletePlaylist() {
 void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
 {
     switch (mouse) {
       case 1:
           break;
       case 2:{
-    QPopupMenu  m;
-    m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
-    m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
-    m.insertSeparator();
-    if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) 
-    m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
+
+          QPopupMenu  m;
+          m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
+          m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
+          m.insertSeparator();
+          if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) 
+              m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
     
-    m.exec( QCursor::pos() );
+          m.exec( QCursor::pos() );
       }
-    break;
+          break;
     };
 }
 
 void PlayListWidget::playSelected()
 {
     btnPlay( TRUE);
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h
index 6569f35..5837ed3 100644
--- a/core/multimedia/opieplayer/playlistwidget.h
+++ b/core/multimedia/opieplayer/playlistwidget.h
@@ -54,13 +54,13 @@ public:
     // retrieve the current playlist entry (media file link)
     const DocLnk *current();
     void useSelectedDocument();
 /*     QTimer    * menuTimer; */
     FileSelector*  playLists;
     QPushButton *tbDeletePlaylist;
-    int fd;
+    int fd, selected;
 public slots:
     bool first();
     bool last();
     bool next();
     bool prev();
 /*     void setFullScreen(); */