summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 00:04:09 (UTC)
committer simon <simon>2002-12-09 00:04:09 (UTC)
commit88882051547c9c62f47fb83d87f1341ebccf99a7 (patch) (side-by-side diff)
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
@@ -171,8 +171,8 @@ void Lib::stop() {
xine_stop( m_stream );
}
-void Lib::pause() {
- xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
+void Lib::pause( bool toggle ) {
+ xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
}
int Lib::speed() const {
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
@@ -71,7 +71,7 @@ namespace XINE {
int startPos = 0,
int start_time = 0 );
void stop();
- void pause();
+ void pause( bool toggle );
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
@@ -144,11 +144,7 @@ void XineControl::stop( bool isSet ) {
* @isSet
*/
void XineControl::pause( bool isSet) {
- if ( isSet ) {
- libXine->pause();
- } else {
- libXine->play( m_fileName, 0, m_currentTime );
- }
+ libXine->pause( isSet );
}