summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-06-13 04:46:12 (UTC)
committer llornkcor <llornkcor>2002-06-13 04:46:12 (UTC)
commit7ab4c2b4684287ac5f629445abcedb34ebfce9f3 (patch) (side-by-side diff)
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 @@
+
#include <stdlib.h>
@@ -190,2 +191,3 @@ 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;
@@ -205,3 +207,2 @@ AudioDevice::AudioDevice( unsigned int f, unsigned int chs, unsigned int bps ) {
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << TRUE;
@@ -266,3 +267,2 @@ AudioDevice::~AudioDevice() {
#endif
- QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << FALSE;
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) {
{
-// if(audioView->selectedItem()) {
- addToSelection( audioView->selectedItem() );
+ addToSelection( audioView->currentItem() );
mediaPlayerState->setPlaying(b);
@@ -850,3 +849,2 @@ void PlayListWidget::btnPlay(bool b) {
// audioView->clearSelection();
-// }
}
@@ -855,4 +853,3 @@ void PlayListWidget::btnPlay(bool b) {
{
-// if(videoView->selectedItem() ) {
- addToSelection( videoView->selectedItem() );
+ addToSelection( videoView->currentItem() );
mediaPlayerState->setPlaying(b);
@@ -864,3 +861,2 @@ void PlayListWidget::btnPlay(bool b) {
// videoView->clearSelection();
-// }
}
@@ -890,12 +886,13 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint&
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;
};
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:
QPushButton *tbDeletePlaylist;
- int fd;
+ int fd, selected;
public slots: