summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/xinecontrol.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opieplayer2/xinecontrol.cpp') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 9f944d7..e1816c8 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -82,5 +82,5 @@ void XineControl::init()
XineControl::~XineControl() {
-#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+#if !defined(QT_NO_COP)
if ( disabledSuspendScreenSaver ) {
disabledSuspendScreenSaver = FALSE;
@@ -111,10 +111,8 @@ void XineControl::play( const QString& fileName ) {
if ( !libXine->hasVideo() ) {
displayType = MediaPlayerState::Audio;
- odebug << "HAS AUDIO" << oendl;
libXine->setShowVideo( false );
hasAudioChannel = TRUE;
} else {
displayType = MediaPlayerState::Video;
- odebug << "HAS VIDEO" << oendl;
libXine->setShowVideo( true );
hasVideoChannel = TRUE;
@@ -151,5 +149,5 @@ void XineControl::stop( bool isSet ) {
libXine->stop();
-#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+#if !defined(QT_NO_COP)
if ( disabledSuspendScreenSaver ) {
disabledSuspendScreenSaver = FALSE;
@@ -177,5 +175,4 @@ long XineControl::currentTime() {
m_currentTime = libXine->currentTime();
return m_currentTime;
- QTimer::singleShot( 1000, this, SLOT( currentTime() ) );
}
@@ -258,4 +255,6 @@ QString XineControl::getErrorCode() {
} else if ( errorCode == 4 ) {
return tr( "Malformed MRL" );
+ } else if ( errorCode == 5 ) {
+ return tr( "Input failed" );
} else {
return tr( "Some other error" );