Diffstat (limited to 'noncore/multimedia/opieplayer2/xinecontrol.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 15 |
1 files changed, 7 insertions, 8 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 @@ -83,3 +83,3 @@ void XineControl::init() XineControl::~XineControl() { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) if ( disabledSuspendScreenSaver ) { @@ -99,3 +99,3 @@ void XineControl::play( const QString& fileName ) { - odebug << "<<FILENAME: " + fileName + ">>>>" << oendl; + odebug << "<<FILENAME: " + fileName + ">>>>" << oendl; @@ -112,3 +112,2 @@ void XineControl::play( const QString& fileName ) { displayType = MediaPlayerState::Audio; - odebug << "HAS AUDIO" << oendl; libXine->setShowVideo( false ); @@ -117,3 +116,2 @@ void XineControl::play( const QString& fileName ) { displayType = MediaPlayerState::Video; - odebug << "HAS VIDEO" << oendl; libXine->setShowVideo( true ); @@ -152,3 +150,3 @@ void XineControl::stop( bool isSet ) { -#if defined(Q_WS_QWS) && !defined(QT_NO_COP) +#if !defined(QT_NO_COP) if ( disabledSuspendScreenSaver ) { @@ -178,3 +176,2 @@ long XineControl::currentTime() { return m_currentTime; - QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); } @@ -249,3 +246,3 @@ QString XineControl::getErrorCode() { - odebug << QString("ERRORCODE: %1 ").arg(errorCode) << oendl; + odebug << QString("ERRORCODE: %1 ").arg(errorCode) << oendl; @@ -254,3 +251,3 @@ QString XineControl::getErrorCode() { } else if ( errorCode == 2 ) { - return tr( "No demux plugin found for this media type" ); + return tr( "No demux plugin found for this media type" ); } else if ( errorCode == 3 ) { @@ -259,2 +256,4 @@ QString XineControl::getErrorCode() { return tr( "Malformed MRL" ); + } else if ( errorCode == 5 ) { + return tr( "Input failed" ); } else { |