author | harlekin <harlekin> | 2002-07-06 23:21:45 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-06 23:21:45 (UTC) |
commit | f975653aeec521ec473ed27eba1fc4d7648c0dd3 (patch) (side-by-side diff) | |
tree | 3273440fc22fba619a90846e71ce8fde54dcd980 /noncore/multimedia/opieplayer2/mediaplayer.cpp | |
parent | 345c2059bdcfcde8c03c7ae6332b075705ac0a6f (diff) | |
download | opie-f975653aeec521ec473ed27eba1fc4d7648c0dd3.zip opie-f975653aeec521ec473ed27eba1fc4d7648c0dd3.tar.gz opie-f975653aeec521ec473ed27eba1fc4d7648c0dd3.tar.bz2 |
first try to get stuff together
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediaplayer.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 87184ba..be59d8d 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -15,6 +15,7 @@ #include "mediaplayerstate.h" + extern AudioWidget *audioUI; extern PlayListWidget *playList; extern MediaPlayerState *mediaPlayerState; @@ -24,6 +25,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { + xineControl = new XineControl(); // QPEApplication::grabKeyboard(); // EVIL connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); @@ -36,6 +38,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); + } MediaPlayer::~MediaPlayer() { @@ -43,9 +46,10 @@ MediaPlayer::~MediaPlayer() { void MediaPlayer::pauseCheck( bool b ) { // Only pause if playing - if ( b && !mediaPlayerState->playing() ) + if ( b && !mediaPlayerState->playing() ) { mediaPlayerState->setPaused( FALSE ); } +} void MediaPlayer::play() { mediaPlayerState->setPlaying( FALSE ); @@ -70,6 +74,7 @@ void MediaPlayer::setPlaying( bool play ) { audioUI->setTickerText( currentFile->file() ); + xineControl->play( currentFile->file() ); // alles nicht nötig, xine kümmert sich drum, man muss nur den return andio oder video gui geben |