summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp7
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp29
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h8
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp9
5 files changed, 42 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 125fd72..303e56e 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -125,7 +125,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
125} 125}
126 126
127AudioWidget::~AudioWidget() { 127AudioWidget::~AudioWidget() {
128 mediaPlayerState->isStreaming = FALSE; 128 mediaPlayerState->setIsStreaming( FALSE );
129 for ( int i = 0; i < 3; i++ ) { 129 for ( int i = 0; i < 3; i++ ) {
130 delete pixmaps[i]; 130 delete pixmaps[i];
131 } 131 }
@@ -161,7 +161,7 @@ void AudioWidget::setLength( long max ) {
161 161
162 162
163void AudioWidget::setView( char view ) { 163void AudioWidget::setView( char view ) {
164 if (mediaPlayerState->isStreaming) { 164 if (mediaPlayerState->streaming() ) {
165 if( !slider->isHidden()) slider->hide(); 165 if( !slider->isHidden()) slider->hide();
166 disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); 166 disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
167 disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); 167 disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 0ab0124..38ba08f 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -75,13 +75,6 @@ void MediaPlayer::setPlaying( bool play ) {
75 audioUI->setTickerText( currentFile->file( ) ); 75 audioUI->setTickerText( currentFile->file( ) );
76 76
77 xineControl->play( currentFile->file() ); 77 xineControl->play( currentFile->file() );
78
79 // alles nicht nötig, xine kümmert sich drum, man muss nur den return andio oder video gui geben
80
81 // Ob auch video 'v' : 'a'
82 // mediaPlayerState->setView( 'v' );
83
84 // abspielen starten.
85} 78}
86 79
87 80
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index 3090b08..778cd1e 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -56,6 +56,12 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
56 56
57 57
58// public stuff 58// public stuff
59
60
61bool MediaPlayerState::streaming() {
62 return isStreaming;
63}
64
59bool MediaPlayerState::fullscreen() { 65bool MediaPlayerState::fullscreen() {
60 return isFullscreen; 66 return isFullscreen;
61} 67}
@@ -85,6 +91,10 @@ bool MediaPlayerState::playing() {
85 return isPlaying; 91 return isPlaying;
86} 92}
87 93
94bool MediaPlayerState::stop() {
95 return isStoped;
96}
97
88long MediaPlayerState::position() { 98long MediaPlayerState::position() {
89 return curPosition; 99 return curPosition;
90} 100}
@@ -98,6 +108,14 @@ char MediaPlayerState::view() {
98} 108}
99 109
100// slots 110// slots
111void MediaPlayerState::setIsStreaming( bool b ) {
112 if ( isStreaming == b ) {
113 return;
114 }
115 isStreaming = b;
116}
117
118
101void MediaPlayerState::setFullscreen( bool b ) { 119void MediaPlayerState::setFullscreen( bool b ) {
102 if ( isFullscreen == b ) { 120 if ( isFullscreen == b ) {
103 return; 121 return;
@@ -152,9 +170,18 @@ void MediaPlayerState::setPlaying( bool b ) {
152 return; 170 return;
153 } 171 }
154 isPlaying = b; 172 isPlaying = b;
173 isStoped = !b;
155 emit playingToggled(b); 174 emit playingToggled(b);
156} 175}
157 176
177void MediaPlayerState::setStop( bool b ) {
178 if ( isStoped == b ) {
179 return;
180 }
181 isStoped = b;
182 emit stopToggled(b);
183}
184
158void MediaPlayerState::setPosition( long p ) { 185void MediaPlayerState::setPosition( long p ) {
159 if ( curPosition == p ) { 186 if ( curPosition == p ) {
160 return; 187 return;
@@ -208,8 +235,6 @@ void MediaPlayerState::setAudio() {
208 setView('a'); 235 setView('a');
209} 236}
210 237
211
212
213void MediaPlayerState::toggleFullscreen() { 238void MediaPlayerState::toggleFullscreen() {
214 setFullscreen( !isFullscreen ); 239 setFullscreen( !isFullscreen );
215} 240}
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index dbbb0f2..20e3552 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -16,7 +16,7 @@ public:
16 MediaPlayerState( QObject *parent, const char *name ); 16 MediaPlayerState( QObject *parent, const char *name );
17 ~MediaPlayerState(); 17 ~MediaPlayerState();
18 18
19 bool isStreaming; 19 bool streaming();
20 bool fullscreen(); 20 bool fullscreen();
21 bool scaled(); 21 bool scaled();
22 bool looping(); 22 bool looping();
@@ -24,11 +24,13 @@ public:
24 bool playlist(); 24 bool playlist();
25 bool paused(); 25 bool paused();
26 bool playing(); 26 bool playing();
27 bool stop();
27 long position(); 28 long position();
28 long length(); 29 long length();
29 char view(); 30 char view();
30 31
31public slots: 32public slots:
33 void setIsStreaming( bool b );
32 void setFullscreen( bool b ); 34 void setFullscreen( bool b );
33 void setScaled( bool b ); 35 void setScaled( bool b );
34 void setLooping( bool b ); 36 void setLooping( bool b );
@@ -36,6 +38,7 @@ public slots:
36 void setPlaylist( bool b ); 38 void setPlaylist( bool b );
37 void setPaused( bool b ); 39 void setPaused( bool b );
38 void setPlaying( bool b ); 40 void setPlaying( bool b );
41 void setStop( bool b );
39 void setPosition( long p ); 42 void setPosition( long p );
40 void updatePosition( long p ); 43 void updatePosition( long p );
41 void setLength( long l ); 44 void setLength( long l );
@@ -63,6 +66,7 @@ signals:
63 void playlistToggled( bool ); 66 void playlistToggled( bool );
64 void pausedToggled( bool ); 67 void pausedToggled( bool );
65 void playingToggled( bool ); 68 void playingToggled( bool );
69 void stopToggled( bool );
66 void positionChanged( long ); // When the slider is moved 70 void positionChanged( long ); // When the slider is moved
67 void positionUpdated( long ); // When the media file progresses 71 void positionUpdated( long ); // When the media file progresses
68 void lengthChanged( long ); 72 void lengthChanged( long );
@@ -72,6 +76,7 @@ signals:
72 void next(); 76 void next();
73 77
74private: 78private:
79 bool isStreaming;
75 bool isFullscreen; 80 bool isFullscreen;
76 bool isScaled; 81 bool isScaled;
77 bool isLooping; 82 bool isLooping;
@@ -79,6 +84,7 @@ private:
79 bool usePlaylist; 84 bool usePlaylist;
80 bool isPaused; 85 bool isPaused;
81 bool isPlaying; 86 bool isPlaying;
87 bool isStoped;
82 long curPosition; 88 long curPosition;
83 long curLength; 89 long curLength;
84 char curView; 90 char curView;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index cda9be2..5b674f8 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -24,15 +24,18 @@ void XineControl::play( const QString& fileName ) {
24 // default to audio view until we know how to handle video 24 // default to audio view until we know how to handle video
25 mediaPlayerState->setView('a'); 25 mediaPlayerState->setView('a');
26 // determines of slider is shown 26 // determines of slider is shown
27 mediaPlayerState->isStreaming = false; 27 // mediaPlayerState->setIsStreaming( false );
28 // hier dann schaun welcher view 28 // hier dann schaun welcher view
29} 29}
30 30
31void XineControl::stop( bool isSet ) { 31void XineControl::stop( bool isSet ) {
32 if ( isSet) { 32 if ( !isSet) {
33 libXine->stop(); 33 libXine->stop();
34 mediaPlayerState->setNext();
35 //mediaPlayerState->setPlaying( false );
36 } else {
37 // play again
34 } 38 }
35 // mediaPlayerState->setPlaying( false );
36} 39}
37 40
38void XineControl::pause( bool isSet) { 41void XineControl::pause( bool isSet) {