author | harlekin <harlekin> | 2002-07-09 01:02:37 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-09 01:02:37 (UTC) |
commit | 577841e20b5657411194d74a143b0319fc05cda3 (patch) (unidiff) | |
tree | 0e41da19fff8e2f47d43612a96d503b49b6a6a0b | |
parent | 56554891922367c5d4e7d0f6965daa1026c0cc54 (diff) | |
download | opie-577841e20b5657411194d74a143b0319fc05cda3.zip opie-577841e20b5657411194d74a143b0319fc05cda3.tar.gz opie-577841e20b5657411194d74a143b0319fc05cda3.tar.bz2 |
more gui updates
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 7 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.cpp | 29 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 9 |
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 | |||
@@ -127,3 +127,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
127 | AudioWidget::~AudioWidget() { | 127 | AudioWidget::~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++ ) { |
@@ -163,3 +163,3 @@ void AudioWidget::setLength( long max ) { | |||
163 | void AudioWidget::setView( char view ) { | 163 | void AudioWidget::setView( char view ) { |
164 | if (mediaPlayerState->isStreaming) { | 164 | if (mediaPlayerState->streaming() ) { |
165 | if( !slider->isHidden()) slider->hide(); | 165 | if( !slider->isHidden()) slider->hide(); |
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 | |||
@@ -77,9 +77,2 @@ void MediaPlayer::setPlaying( bool play ) { | |||
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 | } |
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 | |||
@@ -58,2 +58,8 @@ void MediaPlayerState::writeConfig( Config& cfg ) const { | |||
58 | // public stuff | 58 | // public stuff |
59 | |||
60 | |||
61 | bool MediaPlayerState::streaming() { | ||
62 | return isStreaming; | ||
63 | } | ||
64 | |||
59 | bool MediaPlayerState::fullscreen() { | 65 | bool MediaPlayerState::fullscreen() { |
@@ -87,2 +93,6 @@ bool MediaPlayerState::playing() { | |||
87 | 93 | ||
94 | bool MediaPlayerState::stop() { | ||
95 | return isStoped; | ||
96 | } | ||
97 | |||
88 | long MediaPlayerState::position() { | 98 | long MediaPlayerState::position() { |
@@ -100,2 +110,10 @@ char MediaPlayerState::view() { | |||
100 | // slots | 110 | // slots |
111 | void MediaPlayerState::setIsStreaming( bool b ) { | ||
112 | if ( isStreaming == b ) { | ||
113 | return; | ||
114 | } | ||
115 | isStreaming = b; | ||
116 | } | ||
117 | |||
118 | |||
101 | void MediaPlayerState::setFullscreen( bool b ) { | 119 | void MediaPlayerState::setFullscreen( bool b ) { |
@@ -154,2 +172,3 @@ void MediaPlayerState::setPlaying( bool b ) { | |||
154 | isPlaying = b; | 172 | isPlaying = b; |
173 | isStoped = !b; | ||
155 | emit playingToggled(b); | 174 | emit playingToggled(b); |
@@ -157,2 +176,10 @@ void MediaPlayerState::setPlaying( bool b ) { | |||
157 | 176 | ||
177 | void MediaPlayerState::setStop( bool b ) { | ||
178 | if ( isStoped == b ) { | ||
179 | return; | ||
180 | } | ||
181 | isStoped = b; | ||
182 | emit stopToggled(b); | ||
183 | } | ||
184 | |||
158 | void MediaPlayerState::setPosition( long p ) { | 185 | void MediaPlayerState::setPosition( long p ) { |
@@ -210,4 +237,2 @@ void MediaPlayerState::setAudio() { | |||
210 | 237 | ||
211 | |||
212 | |||
213 | void MediaPlayerState::toggleFullscreen() { | 238 | void MediaPlayerState::toggleFullscreen() { |
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 | |||
@@ -18,3 +18,3 @@ public: | |||
18 | 18 | ||
19 | bool isStreaming; | 19 | bool streaming(); |
20 | bool fullscreen(); | 20 | bool fullscreen(); |
@@ -26,2 +26,3 @@ public: | |||
26 | bool playing(); | 26 | bool playing(); |
27 | bool stop(); | ||
27 | long position(); | 28 | long position(); |
@@ -31,2 +32,3 @@ public: | |||
31 | public slots: | 32 | public slots: |
33 | void setIsStreaming( bool b ); | ||
32 | void setFullscreen( bool b ); | 34 | void setFullscreen( bool b ); |
@@ -38,2 +40,3 @@ public slots: | |||
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 ); |
@@ -65,2 +68,3 @@ signals: | |||
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 |
@@ -74,2 +78,3 @@ signals: | |||
74 | private: | 78 | private: |
79 | bool isStreaming; | ||
75 | bool isFullscreen; | 80 | bool isFullscreen; |
@@ -81,2 +86,3 @@ private: | |||
81 | bool isPlaying; | 86 | bool isPlaying; |
87 | bool isStoped; | ||
82 | long curPosition; | 88 | long curPosition; |
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 | |||
@@ -26,3 +26,3 @@ void XineControl::play( const QString& fileName ) { | |||
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 |
@@ -31,6 +31,9 @@ void XineControl::play( const QString& fileName ) { | |||
31 | void XineControl::stop( bool isSet ) { | 31 | void 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 | } |