author | harlekin <harlekin> | 2002-07-08 23:46:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-08 23:46:13 (UTC) |
commit | 56554891922367c5d4e7d0f6965daa1026c0cc54 (patch) (side-by-side diff) | |
tree | a21ce87e748517bfb5011a78f2e306826c493db2 | |
parent | 647a6c7ec282ea9b0b45baf8935b8eefc3ff8269 (diff) | |
download | opie-56554891922367c5d4e7d0f6965daa1026c0cc54.zip opie-56554891922367c5d4e7d0f6965daa1026c0cc54.tar.gz opie-56554891922367c5d4e7d0f6965daa1026c0cc54.tar.bz2 |
more gui parts working now
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 20 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 2 |
3 files changed, 24 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index be59d8d..0ab0124 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -81,35 +81,39 @@ void MediaPlayer::setPlaying( bool play ) { // Ob auch video 'v' : 'a' // mediaPlayerState->setView( 'v' ); // abspielen starten. } void MediaPlayer::prev() { - if ( playList->prev() ) + if ( playList->prev() ) { play(); - else if ( mediaPlayerState->looping() ) { - if ( playList->last() ) + } else if ( mediaPlayerState->looping() ) { + if ( playList->last() ) { play(); - } else + } + } else { mediaPlayerState->setList(); } +} void MediaPlayer::next() { - if ( playList->next() ) + if ( playList->next() ) { play(); - else if ( mediaPlayerState->looping() ) { - if ( playList->first() ) + } else if ( mediaPlayerState->looping() ) { + if ( playList->first() ) { play(); - } else + } + } else { mediaPlayerState->setList(); } +} void MediaPlayer::startDecreasingVolume() { volumeDirection = -1; startTimer( 100 ); // da kommt demn�chst osound denk ich mal // AudioDevice::decreaseVolume(); } diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index aaa1a24..cda9be2 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -5,35 +5,43 @@ extern MediaPlayerState *mediaPlayerState; XineControl::XineControl( QObject *parent, const char *name ) : QObject( parent, name ) { libXine = new XINE::Lib(); connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); + connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); } XineControl::~XineControl() { delete libXine; } void XineControl::play( const QString& fileName ) { libXine->play( fileName ); mediaPlayerState->setPlaying( true ); + // default to audio view until we know how to handle video + mediaPlayerState->setView('a'); + // determines of slider is shown + mediaPlayerState->isStreaming = false; // hier dann schaun welcher view } -void XineControl::stop() { +void XineControl::stop( bool isSet ) { + if ( isSet) { libXine->stop(); - mediaPlayerState->setPlaying( false ); } + // mediaPlayerState->setPlaying( false ); +} + +void XineControl::pause( bool isSet) { -void XineControl::pause( bool ) { libXine->pause(); } int XineControl::currentTime() { // todo: jede sekunde �berpr�fen m_currentTime = libXine->currentTime(); return m_currentTime; } diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index 58ad8ec..e45f1df 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h @@ -8,17 +8,17 @@ class XineControl : public QObject { Q_OBJECT public: XineControl( QObject *parent = 0, const char *name =0 ); ~XineControl(); public slots: void play( const QString& fileName ); - void stop(); + void stop( bool ); void pause( bool ); int currentTime(); // get length of media file and set it void length(); int position(); |