summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 00:04:09 (UTC)
committer simon <simon>2002-12-09 00:04:09 (UTC)
commit88882051547c9c62f47fb83d87f1341ebccf99a7 (patch) (unidiff)
tree7c5dec3d715b37c5c80fa9c017d55b57cf76cb7b
parent373051a9f8e624e57bac83bb09af1840fef14b4c (diff)
downloadopie-88882051547c9c62f47fb83d87f1341ebccf99a7.zip
opie-88882051547c9c62f47fb83d87f1341ebccf99a7.tar.gz
opie-88882051547c9c62f47fb83d87f1341ebccf99a7.tar.bz2
- use xine_set_param( ..., XINE_PARAM_SPEED, with XINE_SPEED_PAUSE and
XINE_SPEED_NORMAL to toggle between pause and playing state, instead of attempting to re-start the stream at the last position
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/lib.h2
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp6
3 files changed, 4 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 1b5fd51..9e818eb 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -172,6 +172,6 @@ void Lib::stop() {
172} 172}
173 173
174void Lib::pause() { 174void Lib::pause( bool toggle ) {
175 xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE ); 175 xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
176} 176}
177 177
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 3224cb9..37a4f9a 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -72,5 +72,5 @@ namespace XINE {
72 int start_time = 0 ); 72 int start_time = 0 );
73 void stop(); 73 void stop();
74 void pause(); 74 void pause( bool toggle );
75 75
76 int speed() const; 76 int speed() const;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 6f1cd9c..0e81fa2 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -145,9 +145,5 @@ void XineControl::stop( bool isSet ) {
145 */ 145 */
146void XineControl::pause( bool isSet) { 146void XineControl::pause( bool isSet) {
147 if ( isSet ) { 147 libXine->pause( isSet );
148 libXine->pause();
149 } else {
150 libXine->play( m_fileName, 0, m_currentTime );
151 }
152} 148}
153 149