summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp32
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h2
3 files changed, 31 insertions, 19 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
@@ -86,24 +86,28 @@ void MediaPlayer::setPlaying( bool play ) {
86 86
87 87
88void MediaPlayer::prev() { 88void 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 mediaPlayerState->setList(); 95 } else {
96 mediaPlayerState->setList();
97 }
96} 98}
97 99
98 100
99void MediaPlayer::next() { 101void 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 }
106 mediaPlayerState->setList(); 108 } else {
109 mediaPlayerState->setList();
110 }
107} 111}
108 112
109 113
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
@@ -10,6 +10,7 @@ XineControl::XineControl( QObject *parent, const char *name )
10 10
11 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 11 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
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
14} 15}
15 16
@@ -20,15 +21,22 @@ XineControl::~XineControl() {
20void XineControl::play( const QString& fileName ) { 21void XineControl::play( const QString& fileName ) {
21 libXine->play( fileName ); 22 libXine->play( 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
24} 29}
25 30
26void XineControl::stop() { 31void XineControl::stop( bool isSet ) {
27 libXine->stop(); 32 if ( isSet) {
28 mediaPlayerState->setPlaying( false ); 33 libXine->stop();
34 }
35 // mediaPlayerState->setPlaying( false );
29} 36}
30 37
31void XineControl::pause( bool ) { 38void XineControl::pause( bool isSet) {
39
32 libXine->pause(); 40 libXine->pause();
33} 41}
34 42
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
@@ -13,7 +13,7 @@ public:
13 13
14public slots: 14public 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 );
18 18
19 int currentTime(); 19 int currentTime();