summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-05-04 21:34:02 (UTC)
committer llornkcor <llornkcor>2003-05-04 21:34:02 (UTC)
commit2894d0b14c0b3efa3ce259214b5aa597a6abfed1 (patch) (side-by-side diff)
tree8dec50e12adb1b66eaf20e1caa4f384a43033073
parent7372d0271b19bc6ead8e796a949746ae45fe13fa (diff)
downloadopie-2894d0b14c0b3efa3ce259214b5aa597a6abfed1.zip
opie-2894d0b14c0b3efa3ce259214b5aa597a6abfed1.tar.gz
opie-2894d0b14c0b3efa3ce259214b5aa597a6abfed1.tar.bz2
added a few convience qcop messages. see readme for more info. not totally finished yet
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/README22
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp49
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h3
3 files changed, 74 insertions, 0 deletions
diff --git a/noncore/multimedia/opieplayer2/README b/noncore/multimedia/opieplayer2/README
new file mode 100644
index 0000000..8db1376
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/README
@@ -0,0 +1,22 @@
+qcop channel is:
+QPE/Application/opieplayer2
+
+qcop calls enabled:
+"play()" //plays current selection
+"stop()" //stops playing
+"togglePause()"//pauses
+"next()" //select next in list
+"prev()" //select previous in list
+"toggleLooping()" //loop or not loop
+"toggleShuffled()" //shuffled or not shuffled
+"play(QString)" //play this now, needs full file path
+"add(QString)" //add to playlist, needs full file path
+
+
+qcop calls to be enabled:
+"volUp()" //volume more
+"volDown()" //volume less
+"rem(QString)" //remove from playlist
+"getPlaylist()" // gets list of songs in current playlist
+
+
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 580460e..c91a565 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -145,12 +145,17 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
&mediaPlayerState, SLOT( setVideoGamma( int ) ) );
// see which skins are installed
populateSkinsMenu();
initializeStates();
+ channel = new QCopChannel( "QPE/Application/opieplayer2", this );
+ connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+ this, SLOT( qcopReceive(const QCString&, const QByteArray&)) );
+
+
cfg.setGroup("PlayList");
QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
loadList(DocLnk( currentPlaylist ) );
tabWidget->showPage( playListTab );
}
@@ -911,6 +916,50 @@ PlayListWidget::Entry PlayListWidget::currentEntry() const
return Entry( currentFileListPathName() );
}
QString PlayListWidget::currentFileListPathName() const {
return currentFileListView->currentItem()->text( 3 );
}
+
+
+void PlayListWidget::qcopReceive(const QCString &msg, const QByteArray &data) {
+ qDebug("qcop message "+msg );
+ QDataStream stream ( data, IO_ReadOnly );
+ if ( msg == "play()" ) { //plays current selection
+ btnPlay( true);
+ } else if ( msg == "stop()" ) {
+ mediaPlayerState.setPlaying( false);
+ } else if ( msg == "togglePause()" ) {
+ mediaPlayerState.togglePaused();
+ } else if ( msg == "next()" ) { //select next in list
+ mediaPlayerState.setNext();
+ } else if ( msg == "prev()" ) { //select previous in list
+ mediaPlayerState.setPrev();
+ } else if ( msg == "toggleLooping()" ) { //loop or not loop
+ mediaPlayerState.toggleLooping();
+ } else if ( msg == "toggleShuffled()" ) { //shuffled or not shuffled
+ mediaPlayerState.toggleShuffled();
+ } else if ( msg == "volUp()" ) { //volume more
+// emit moreClicked();
+// emit moreReleased();
+ } else if ( msg == "volDown()" ) { //volume less
+// emit lessClicked();
+// emit lessReleased();
+ } else if ( msg == "play(QString)" ) { //play this now
+ QString file;
+ stream >> file;
+ setDocument( (const QString &) file);
+ } else if ( msg == "add(QString)" ) { //add to playlist
+ QString file;
+ stream >> file;
+ QFileInfo fileInfo(file);
+ DocLnk lnk;
+ lnk.setName( fileInfo.baseName() ); //sets name
+ lnk.setFile( file ); //sets file name
+ addToSelection( lnk );
+ } else if ( msg == "rem(QString)" ) { //remove from playlist
+ QString file;
+ stream >> file;
+
+ }
+
+}
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index cb65d5c..54e9d16 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -37,12 +37,13 @@
#include <qmainwindow.h>
#include <qpe/applnk.h>
#include <qtabwidget.h>
#include <qpe/fileselector.h>
#include <qpushbutton.h>
#include <qpopupmenu.h>
+#include <qpe/qcopenvelope_qws.h>
#include "playlistwidgetgui.h"
//class PlayListWidgetPrivate;
class Config;
@@ -84,12 +85,13 @@ public slots:
bool last();
bool next();
bool prev();
void writeDefaultPlaylist( );
QString currentFileListPathName() const;
protected:
+ QCopChannel * channel;
void keyReleaseEvent( QKeyEvent *e);
signals:
void skinSelected();
private:
@@ -99,12 +101,13 @@ private:
void readListFromFile(const QString &);
void initializeStates();
bool inFileListMode() const;
private slots:
+ void qcopReceive(const QCString&, const QByteArray&);
void populateSkinsMenu();
void skinsMenuActivated(int);
void pmViewActivated(int);
void writem3u();
void writeCurrentM3u();
void openFile();