author | harlekin <harlekin> | 2002-07-08 23:46:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-08 23:46:13 (UTC) |
commit | 56554891922367c5d4e7d0f6965daa1026c0cc54 (patch) (unidiff) | |
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 | |||
@@ -88,10 +88,12 @@ void MediaPlayer::setPlaying( bool play ) { | |||
88 | void MediaPlayer::prev() { | 88 | void MediaPlayer::prev() { |
89 | if ( playList->prev() ) | 89 | if ( playList->prev() ) { |
90 | play(); | 90 | play(); |
91 | else if ( mediaPlayerState->looping() ) { | 91 | } else if ( mediaPlayerState->looping() ) { |
92 | if ( playList->last() ) | 92 | if ( playList->last() ) { |
93 | play(); | 93 | play(); |
94 | } else | 94 | } |
95 | } else { | ||
95 | mediaPlayerState->setList(); | 96 | mediaPlayerState->setList(); |
96 | } | 97 | } |
98 | } | ||
97 | 99 | ||
@@ -99,10 +101,12 @@ void MediaPlayer::prev() { | |||
99 | void MediaPlayer::next() { | 101 | void MediaPlayer::next() { |
100 | if ( playList->next() ) | 102 | if ( playList->next() ) { |
101 | play(); | 103 | play(); |
102 | else if ( mediaPlayerState->looping() ) { | 104 | } else if ( mediaPlayerState->looping() ) { |
103 | if ( playList->first() ) | 105 | if ( playList->first() ) { |
104 | play(); | 106 | play(); |
105 | } else | 107 | } |
108 | } else { | ||
106 | mediaPlayerState->setList(); | 109 | mediaPlayerState->setList(); |
107 | } | 110 | } |
111 | } | ||
108 | 112 | ||
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 | |||
@@ -12,2 +12,3 @@ XineControl::XineControl( QObject *parent, const char *name ) | |||
12 | connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); | 12 | connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); |
13 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | ||
13 | 14 | ||
@@ -22,2 +23,6 @@ void XineControl::play( const QString& fileName ) { | |||
22 | mediaPlayerState->setPlaying( true ); | 23 | mediaPlayerState->setPlaying( true ); |
24 | // default to audio view until we know how to handle video | ||
25 | mediaPlayerState->setView('a'); | ||
26 | // determines of slider is shown | ||
27 | mediaPlayerState->isStreaming = false; | ||
23 | // hier dann schaun welcher view | 28 | // hier dann schaun welcher view |
@@ -25,8 +30,11 @@ void XineControl::play( const QString& fileName ) { | |||
25 | 30 | ||
26 | void XineControl::stop() { | 31 | void XineControl::stop( bool isSet ) { |
32 | if ( isSet) { | ||
27 | libXine->stop(); | 33 | libXine->stop(); |
28 | mediaPlayerState->setPlaying( false ); | ||
29 | } | 34 | } |
35 | // mediaPlayerState->setPlaying( false ); | ||
36 | } | ||
37 | |||
38 | void XineControl::pause( bool isSet) { | ||
30 | 39 | ||
31 | void XineControl::pause( bool ) { | ||
32 | libXine->pause(); | 40 | libXine->pause(); |
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 | |||
@@ -15,3 +15,3 @@ public slots: | |||
15 | void play( const QString& fileName ); | 15 | void play( const QString& fileName ); |
16 | void stop(); | 16 | void stop( bool ); |
17 | void pause( bool ); | 17 | void pause( bool ); |