-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 46 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.h | 4 |
2 files changed, 50 insertions, 0 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index a0bf4db..5e1be2f 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -139,12 +139,15 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
139 | fromSetDocument = FALSE; | 139 | fromSetDocument = FALSE; |
140 | insanityBool=FALSE; | 140 | insanityBool=FALSE; |
141 | audioScan = FALSE; | 141 | audioScan = FALSE; |
142 | videoScan = FALSE; | 142 | videoScan = FALSE; |
143 | // menuTimer = new QTimer( this ,"menu timer"), | 143 | // menuTimer = new QTimer( this ,"menu timer"), |
144 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); | 144 | // connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) ); |
145 | channel = new QCopChannel( "QPE/Application/opieplayer", this ); | ||
146 | connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), | ||
147 | this, SLOT( qcopReceive(const QCString&, const QByteArray&)) ); | ||
145 | 148 | ||
146 | setBackgroundMode( PaletteButton ); | 149 | setBackgroundMode( PaletteButton ); |
147 | 150 | ||
148 | setCaption( tr("OpiePlayer") ); | 151 | setCaption( tr("OpiePlayer") ); |
149 | setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); | 152 | setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); |
150 | 153 | ||
@@ -1417,6 +1420,49 @@ void PlayListWidget::skinsMenuActivated( int item ) { | |||
1417 | skinsMenu->setItemChecked( item, TRUE ); | 1420 | skinsMenu->setItemChecked( item, TRUE ); |
1418 | 1421 | ||
1419 | Config cfg( "OpiePlayer" ); | 1422 | Config cfg( "OpiePlayer" ); |
1420 | cfg.setGroup("Options"); | 1423 | cfg.setGroup("Options"); |
1421 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); | 1424 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); |
1422 | } | 1425 | } |
1426 | |||
1427 | void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) { | ||
1428 | qDebug("qcop message "+msg ); | ||
1429 | QDataStream stream ( data, IO_ReadOnly ); | ||
1430 | if ( msg == "play()" ) { //plays current selection | ||
1431 | btnPlay( true); | ||
1432 | } else if ( msg == "stop()" ) { | ||
1433 | mediaPlayerState->setPlaying( false); | ||
1434 | } else if ( msg == "togglePause()" ) { | ||
1435 | mediaPlayerState->togglePaused(); | ||
1436 | } else if ( msg == "next()" ) { //select next in list | ||
1437 | mediaPlayerState->setNext(); | ||
1438 | } else if ( msg == "prev()" ) { //select previous in list | ||
1439 | mediaPlayerState->setPrev(); | ||
1440 | } else if ( msg == "toggleLooping()" ) { //loop or not loop | ||
1441 | mediaPlayerState->toggleLooping(); | ||
1442 | } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled | ||
1443 | mediaPlayerState->toggleShuffled(); | ||
1444 | } else if ( msg == "volUp()" ) { //volume more | ||
1445 | // emit moreClicked(); | ||
1446 | // emit moreReleased(); | ||
1447 | } else if ( msg == "volDown()" ) { //volume less | ||
1448 | // emit lessClicked(); | ||
1449 | // emit lessReleased(); | ||
1450 | } else if ( msg == "play(QString)" ) { //play this now | ||
1451 | QString file; | ||
1452 | stream >> file; | ||
1453 | setDocument( (const QString &) file); | ||
1454 | } else if ( msg == "add(QString)" ) { //add to playlist | ||
1455 | QString file; | ||
1456 | stream >> file; | ||
1457 | QFileInfo fileInfo(file); | ||
1458 | DocLnk lnk; | ||
1459 | lnk.setName( fileInfo.baseName() ); //sets name | ||
1460 | lnk.setFile( file ); //sets file name | ||
1461 | addToSelection( lnk ); | ||
1462 | } else if ( msg == "rem(QString)" ) { //remove from playlist | ||
1463 | QString file; | ||
1464 | stream >> file; | ||
1465 | |||
1466 | } | ||
1467 | |||
1468 | } | ||
diff --git a/core/multimedia/opieplayer/playlistwidget.h b/core/multimedia/opieplayer/playlistwidget.h index 1118b76..e66bcb9 100644 --- a/core/multimedia/opieplayer/playlistwidget.h +++ b/core/multimedia/opieplayer/playlistwidget.h | |||
@@ -23,12 +23,14 @@ | |||
23 | #include <qmainwindow.h> | 23 | #include <qmainwindow.h> |
24 | #include <qpe/applnk.h> | 24 | #include <qpe/applnk.h> |
25 | #include <qtabwidget.h> | 25 | #include <qtabwidget.h> |
26 | #include <qpe/fileselector.h> | 26 | #include <qpe/fileselector.h> |
27 | #include <qpushbutton.h> | 27 | #include <qpushbutton.h> |
28 | 28 | ||
29 | #include <qpe/qcopenvelope_qws.h> | ||
30 | |||
29 | #include "om3u.h" | 31 | #include "om3u.h" |
30 | /* #include <qtimer.h> */ | 32 | /* #include <qtimer.h> */ |
31 | 33 | ||
32 | 34 | ||
33 | class PlayListWidgetPrivate; | 35 | class PlayListWidgetPrivate; |
34 | class Config; | 36 | class Config; |
@@ -65,12 +67,13 @@ public slots: | |||
65 | bool last(); | 67 | bool last(); |
66 | bool next(); | 68 | bool next(); |
67 | bool prev(); | 69 | bool prev(); |
68 | /* void setFullScreen(); */ | 70 | /* void setFullScreen(); */ |
69 | /* void setScaled(); */ | 71 | /* void setScaled(); */ |
70 | protected: | 72 | protected: |
73 | QCopChannel * channel; | ||
71 | QPopupMenu *skinsMenu; | 74 | QPopupMenu *skinsMenu; |
72 | /* void contentsMousePressEvent( QMouseEvent * e ); */ | 75 | /* void contentsMousePressEvent( QMouseEvent * e ); */ |
73 | /* void contentsMouseReleaseEvent( QMouseEvent * e ); */ | 76 | /* void contentsMouseReleaseEvent( QMouseEvent * e ); */ |
74 | void keyReleaseEvent( QKeyEvent *e); | 77 | void keyReleaseEvent( QKeyEvent *e); |
75 | void keyPressEvent( QKeyEvent *e); | 78 | void keyPressEvent( QKeyEvent *e); |
76 | private: | 79 | private: |
@@ -87,12 +90,13 @@ private: | |||
87 | void writeConfig( Config& cfg ) const; | 90 | void writeConfig( Config& cfg ) const; |
88 | PlayListWidgetPrivate *d; // Private implementation data | 91 | PlayListWidgetPrivate *d; // Private implementation data |
89 | void populateAudioView(); | 92 | void populateAudioView(); |
90 | void populateVideoView(); | 93 | void populateVideoView(); |
91 | private slots: | 94 | private slots: |
92 | 95 | ||
96 | void qcopReceive(const QCString&, const QByteArray&); | ||
93 | void populateSkinsMenu(); | 97 | void populateSkinsMenu(); |
94 | void skinsMenuActivated(int); | 98 | void skinsMenuActivated(int); |
95 | void writem3u(); | 99 | void writem3u(); |
96 | void writeCurrentM3u(); | 100 | void writeCurrentM3u(); |
97 | void scanForAudio(); | 101 | void scanForAudio(); |
98 | void scanForVideo(); | 102 | void scanForVideo(); |