summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-13 04:46:12 (UTC)
committer llornkcor <llornkcor>2002-06-13 04:46:12 (UTC)
commit7ab4c2b4684287ac5f629445abcedb34ebfce9f3 (patch) (unidiff)
tree28a17efdd2ac4a3b2193b27e14dbd96740fffc66
parent7239ae505999b64c74479c460daba256baf82798 (diff)
downloadopie-7ab4c2b4684287ac5f629445abcedb34ebfce9f3.zip
opie-7ab4c2b4684287ac5f629445abcedb34ebfce9f3.tar.gz
opie-7ab4c2b4684287ac5f629445abcedb34ebfce9f3.tar.bz2
bugfix: menu select play works again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp4
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp25
-rw-r--r--core/multimedia/opieplayer/playlistwidget.h2
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
@@ -21,2 +21,3 @@
21 21
22
22#include <stdlib.h> 23#include <stdlib.h>
@@ -190,2 +191,3 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
190 qDebug("creating new audio device"); 191 qDebug("creating new audio device");
192 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
191 d = new AudioDevicePrivate; 193 d = new AudioDevicePrivate;
@@ -205,3 +207,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
205 207
206 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
207 208
@@ -266,3 +267,2 @@ AudioDevice::~AudioDevice() {
266#endif 267#endif
267 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
268 268
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
@@ -842,4 +842,3 @@ void PlayListWidget::btnPlay(bool b) {
842 { 842 {
843// if(audioView->selectedItem()) { 843 addToSelection( audioView->currentItem() );
844 addToSelection( audioView->selectedItem() );
845 mediaPlayerState->setPlaying(b); 844 mediaPlayerState->setPlaying(b);
@@ -850,3 +849,2 @@ void PlayListWidget::btnPlay(bool b) {
850// audioView->clearSelection(); 849// audioView->clearSelection();
851// }
852 } 850 }
@@ -855,4 +853,3 @@ void PlayListWidget::btnPlay(bool b) {
855 { 853 {
856// if(videoView->selectedItem() ) { 854 addToSelection( videoView->currentItem() );
857 addToSelection( videoView->selectedItem() );
858 mediaPlayerState->setPlaying(b); 855 mediaPlayerState->setPlaying(b);
@@ -864,3 +861,2 @@ void PlayListWidget::btnPlay(bool b) {
864// videoView->clearSelection(); 861// videoView->clearSelection();
865// }
866 } 862 }
@@ -890,12 +886,13 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint&
890 case 2:{ 886 case 2:{
891 QPopupMenu m; 887
892 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 888 QPopupMenu m;
893 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); 889 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
894 m.insertSeparator(); 890 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
895 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) 891 m.insertSeparator();
896 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() )); 892 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )
893 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
897 894
898 m.exec( QCursor::pos() ); 895 m.exec( QCursor::pos() );
899 } 896 }
900 break; 897 break;
901 }; 898 };
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
@@ -59,3 +59,3 @@ public:
59 QPushButton *tbDeletePlaylist; 59 QPushButton *tbDeletePlaylist;
60 int fd; 60 int fd, selected;
61public slots: 61public slots: