From 657eeb18141838eeb0d18351a6755d7fa686f9d9 Mon Sep 17 00:00:00 2001 From: harlekin Date: Tue, 01 Oct 2002 15:36:31 +0000 Subject: mediadetect no longer needed, also beginning of id3 etc tag info support along with some other small fixes --- (limited to 'noncore/multimedia/opieplayer2') diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 620c71f..a6fd334 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp @@ -58,7 +58,7 @@ static const int yo = 22; // movable y offset Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { setFrameStyle( WinPanel | Sunken ); - setText( "No Song" ); + //setText( "No Song" ); } Ticker::~Ticker() { @@ -460,20 +460,15 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { switch (i) { case AudioPlay: if( mediaPlayerState->isPaused ) { -// setToggleButton( i, FALSE ); mediaPlayerState->setPaused( FALSE ); return; } else if( !mediaPlayerState->isPaused ) { -// setToggleButton( i, TRUE ); mediaPlayerState->setPaused( TRUE ); return; - } else { - // setToggleButton( i, TRUE ); - // mediaPlayerState->setPlaying( videoButtons[i].isDown ); } case AudioStop: mediaPlayerState->setPlaying(FALSE); return; - case AudioNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; - case AudioPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; + case AudioNext: if( playList->whichList() ==0 ) mediaPlayerState->setNext(); return; + case AudioPrevious: if( playList->whichList() ==0 ) mediaPlayerState->setPrev(); return; case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; case AudioVolumeUp: emit moreReleased(); return; case AudioVolumeDown: emit lessReleased(); return; @@ -508,7 +503,7 @@ void AudioWidget::closeEvent( QCloseEvent* ) { } -void AudioWidget::paintEvent( QPaintEvent * pe) { +void AudioWidget::paintEvent( QPaintEvent * pe ) { if ( !pe->erased() ) { // Combine with background and double buffer QPixmap pix( pe->rect().size() ); @@ -580,18 +575,6 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) { // toggleButton(4); break; case Key_Escape: { -/* - * author pleas tell me where the i come from .-) - #if defined(QT_QWS_IPAQ) - if( mediaPlayerState->isPaused ) { - setToggleButton( i, FALSE ); - mediaPlayerState->setPaused( FALSE ); - } else if( !mediaPlayerState->isPaused ) { - setToggleButton( i, TRUE ); - mediaPlayerState->setPaused( TRUE ); - } -#endif -*/ } break; diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index 4021d4a..85030de 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -150,7 +150,9 @@ int Lib::subVersion() { int Lib::play( const QString& fileName, int startPos, int start_time ) { QString str = fileName.stripWhiteSpace(); - xine_open( m_xine, QFile::encodeName(str.utf8() ).data() ); + if ( !xine_open( m_xine, QFile::encodeName(str.utf8() ).data() ) ) { + return 0; + } return xine_play( m_xine, startPos, start_time); } @@ -191,16 +193,22 @@ int Lib::length() { } bool Lib::isSeekable() { - return xine_get_stream_info ( m_xine, XINE_STREAM_INFO_SEEKABLE ); + return xine_get_stream_info( m_xine, XINE_STREAM_INFO_SEEKABLE ); +} + +void Lib::seekTo( int time ) { +// xine_trick_mode ( m_xine, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( + xine_play( m_xine, 0, time ); } + Frame Lib::currentFrame() { Frame frame; return frame; }; -QString Lib::metaInfo() { - xine_get_meta_info( m_xine, 0 ); +QString Lib::metaInfo( int number) { + return xine_get_meta_info( m_xine, number ); } int Lib::error() { @@ -216,13 +224,27 @@ void Lib::handleXineEvent( xine_event_t* t ) { void Lib::setShowVideo( bool video ) { m_video = video; - ::null_set_show_video( m_videoOutput, video ); + ::null_set_show_video( m_videoOutput, video ); } bool Lib::isShowingVideo() { return ::null_is_showing_video( m_videoOutput ); } +bool Lib::hasVideo() { + //looks like it is not implemented yet + //return xine_get_stream_info( m_xine, XINE_STREAM_INFO_VIDEO_CHANNELS ); + // ugly hack until xine is ready, look for the width of the video + int test = xine_get_stream_info( m_xine, 2 ); + if( test > 0 ) { + // qDebug( QString(" has video: %1").arg( test ) ); + return true; + } else { + //qDebug ( "does not have video "); + return false; + } +} + void Lib::showVideoFullScreen( bool fullScreen ) { ::null_set_fullscreen( m_videoOutput, fullScreen ); } @@ -232,7 +254,7 @@ bool Lib::isVideoFullScreen() { } void Lib::setScaling( bool scale ) { - ::null_set_scaling( m_videoOutput, scale ); + ::null_set_scaling( m_videoOutput, scale ); } void Lib::setGamma( int value ) { @@ -250,7 +272,7 @@ void Lib::xine_event_handler( void* user_data, xine_event_t* t ) { void Lib::xine_display_frame( void* user_data, uint8_t *frame, int width, int height, int bytes ) { - ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); + ( (Lib*)user_data)->drawFrame( frame, width, height, bytes ); } void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { @@ -258,8 +280,5 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { qWarning("not showing video now"); return; } - -// qWarning( "called draw frame %d %d", width, height ); - m_wid-> setVideoFrame ( frame, width, height, bytes ); } diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index 29adc4d..6cdd9c6 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h @@ -117,9 +117,18 @@ namespace XINE { /** * Get the meta info (like author etc) from the stream - * + * XINE_META_INFO_TITLE 0 + * XINE_META_INFO_COMMENT 1 + * XINE_META_INFO_ARTIST 2 + * XINE_META_INFO_GENRE 3 + * XINE_META_INFO_ALBUM 4 + * XINE_META_INFO_YEAR 5 + * XINE_META_INFO_VIDEOCODEC 6 + * XINE_META_INFO_AUDIOCODEC 7 + * XINE_META_INFO_SYSTEMLAYER 8 + * XINE_META_INFO_INPUT_PLUGIN 9 */ - QString metaInfo() ; + QString metaInfo( int number ); /** * @@ -127,6 +136,17 @@ namespace XINE { bool isScaling(); /** + * seek to a position + */ + void seekTo( int time ); + + /** + * + * @return is media stream has video + */ + bool hasVideo(); + + /** * */ void setScaling( bool ); @@ -144,6 +164,10 @@ namespace XINE { /** * Returns the error code + * XINE_ERROR_NONE 0 + * XINE_ERROR_NO_INPUT_PLUGIN 1 + * XINE_ERROR_NO_DEMUXER_PLUGIN 2 + * XINE_ERROR_DEMUXER_FAILED 3 */ int error() /*const*/; diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 553e3c1..8da7f73 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp @@ -36,7 +36,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { playList->setCaption(tr("OpiePlayer: Initializating")); - + qApp->processEvents(); // QPEApplication::grabKeyboard(); // EVIL connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); @@ -100,37 +100,50 @@ void MediaPlayer::setPlaying( bool play ) { fileName = currentFile->name(); long seconds = mediaPlayerState->length();// time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); - qDebug(time); - - } else { //if playing in file list.. play in a different way - // random and looping settings enabled causes problems here, - // since there is no selected file in the playlist, but a selected file in the file list, - // so we remember and shutoff + //qDebug(time); + + } else { + //if playing in file list.. play in a different way + // random and looping settings enabled causes problems here, + // since there is no selected file in the playlist, but a selected file in the file list, + // so we remember and shutoff l = mediaPlayerState->looping(); - if(l) + if(l) { mediaPlayerState->setLooping( false ); + } r = mediaPlayerState->shuffled(); - mediaPlayerState->setShuffled(false); - + mediaPlayerState->setShuffled( false ); + fileName = playList->currentFileListPathName(); - xineControl->play( fileName); - long seconds = mediaPlayerState->length();// + xineControl->play( fileName ); + long seconds = mediaPlayerState->length(); time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); - qDebug(time); - if( fileName.left(4) != "http" ) - fileName = QFileInfo( fileName).baseName(); + //qDebug(time); + if( fileName.left(4) != "http" ) { + fileName = QFileInfo( fileName ).baseName(); + } } - if( fileName.left(4) == "http" ) - tickerText= tr( " File: " ) + fileName; - else - tickerText = tr( " File: " ) + fileName + tr(", Length: ") + time; + + if( fileName.left(4) == "http" ) { + if ( xineControl->getMetaInfo().isEmpty() ) { + tickerText = tr( " File: " ) + fileName; + } else { + tickerText = xineControl->getMetaInfo(); + } + } else { + if ( xineControl->getMetaInfo().isEmpty() ) { + tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " "; + } else { + tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; + } + } audioUI->setTickerText( tickerText ); } void MediaPlayer::prev() { - if(playList->whichList() == 0) { //if using the playlist + if( playList->whichList() == 0 ) { //if using the playlist if ( playList->prev() ) { play(); } else if ( mediaPlayerState->looping() ) { @@ -192,23 +205,23 @@ void MediaPlayer::stopChangingVolume() { onScreenDisplayVolume = 0; int w=0; int h=0; - if( !xineControl->hasVideo()) { + if( !xineControl->hasVideo() ) { w = audioUI->width(); h = audioUI->height(); - audioUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); + audioUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE ); } else { w = videoUI->width(); h = videoUI->height(); - videoUI->repaint( (w - 200) / 2, h - yoff, 200 + 9, 70, FALSE ); + videoUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE ); } } void MediaPlayer::timerEvent( QTimerEvent * ) { if ( volumeDirection == +1 ) { - volControl->incVol(2); - } else if ( volumeDirection == -1 ) { - volControl->decVol(2); + volControl->incVol( 2 ); + } else if ( volumeDirection == -1 ) { + volControl->decVol( 2 ); } @@ -223,13 +236,13 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { } int w=0; int h=0; - if( !xineControl->hasVideo()) { + if( !xineControl->hasVideo() ) { w = audioUI->width(); h = audioUI->height(); if ( drawnOnScreenDisplay ) { if ( onScreenDisplayVolume > v ) { - audioUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); + audioUI->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE ); } } drawnOnScreenDisplay = TRUE; @@ -246,9 +259,9 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { for ( unsigned int i = 0; i < 10; i++ ) { if ( v > i ) { - p.drawRect( (w - 200) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); + p.drawRect( ( w - 200 ) / 2 + i * 20 + 0, h - yoff + 40, 9, 30 ); } else { - p.drawRect( (w - 200) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); + p.drawRect( ( w - 200 ) / 2 + i * 20 + 3, h - yoff + 50, 3, 10 ); } } } else { @@ -257,7 +270,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { if ( drawnOnScreenDisplay ) { if ( onScreenDisplayVolume > v ) { - videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, (onScreenDisplayVolume - v) * 20 + 9, 30, FALSE ); + videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE ); } } drawnOnScreenDisplay = TRUE; @@ -270,7 +283,7 @@ void MediaPlayer::timerEvent( QTimerEvent * ) { f.setPixelSize( 20 ); f.setBold( TRUE ); p.setFont( f ); - p.drawText( (w - 200) / 2, h - yoff + 20, tr("Volume") ); + p.drawText( (w - 200) / 2, h - yoff + 20, tr( "Volume" ) ); for ( unsigned int i = 0; i < 10; i++ ) { if ( v > i ) { @@ -327,7 +340,7 @@ void MediaPlayer::cleanUp() {// this happens on closing Config cfg( "OpiePlayer" ); mediaPlayerState->writeConfig( cfg ); playList->writeConfig( cfg ); - + // QPEApplication::grabKeyboard(); // QPEApplication::ungrabKeyboard(); } diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index 05be128..131db33 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h @@ -1,3 +1,35 @@ + /* +                This file is part of the Opie Project + +              Copyright (c) 2002 Max Reiss + Copyright (c) 2002 LJP <> + Copyright (c) 2002 Holger Freyther + =. + .=l. +           .>+-= + _;:,     .>    :=|. This program is free software; you can +.> <`_,   >  .   <= redistribute it and/or modify it under +:`=1 )Y*s>-.--   : the terms of the GNU General Public +.="- .-=="i,     .._ License as published by the Free Software + - .   .-<_>     .<> Foundation; either version 2 of the License, +     ._= =}       : or (at your option) any later version. +    .%`+i>       _;_. +    .i_,=:_.      -`: PARTICULAR PURPOSE. See the GNU +..}^=.=       =       ; Library General Public License for more +++=   -.     .`     .: details. + :     =  ...= . :.=- + -.   .:....=;==+<; You should have received a copy of the GNU +  -_. . .   )=.  = Library General Public License along with +    --        :-=` this library; see the file COPYING.LIB. + If not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + +*/ #ifndef MEDIA_PLAYER_H #define MEDIA_PLAYER_H diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro index 1b687a3..619d36d 100644 --- a/noncore/multimedia/opieplayer2/opieplayer2.pro +++ b/noncore/multimedia/opieplayer2/opieplayer2.pro @@ -2,12 +2,12 @@ TEMPLATE = app #CONFIG = qt warn_on release CONFIG = qt warn_on debug DESTDIR = $(OPIEDIR)/bin -HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\ +HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h \ videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\ alphablend.h yuv2rgb.h SOURCES = main.cpp \ - playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\ + playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \ videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \ playlistwidgetgui.cpp\ diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index fabc9a5..c22822c 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp @@ -33,6 +33,7 @@ #include +#include #include #include #include "xinecontrol.h" @@ -43,16 +44,17 @@ extern MediaPlayerState *mediaPlayerState; extern VideoWidget *videoUI; XineControl::XineControl( QObject *parent, const char *name ) : QObject( parent, name ) { + libXine = new XINE::Lib(videoUI->vidWidget() ); - connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ))); - connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); + connect ( videoUI, SIGNAL( videoResized ( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); + connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); - connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); + connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); disabledSuspendScreenSaver = FALSE; } @@ -62,44 +64,48 @@ XineControl::~XineControl() { if ( disabledSuspendScreenSaver ) { disabledSuspendScreenSaver = FALSE; // Re-enable the suspend mode - QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; + QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; } #endif delete libXine; } void XineControl::play( const QString& fileName ) { - hasVideoChannel=FALSE; - hasAudioChannel=FALSE; + hasVideoChannel = FALSE; + hasAudioChannel = FALSE; m_fileName = fileName; //qDebug("<>>>"); - libXine->play( fileName ); - mediaPlayerState->setPlaying( true ); - char whichGui = mdetect.videoOrAudio( fileName ); - if (whichGui == 'f') { - qDebug("Nicht erkannter Dateityp"); + if ( !libXine->play( fileName ) ) { + QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); return; } - if (whichGui == 'a') { + mediaPlayerState->setPlaying( true ); + + char whichGui; + // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) ); + if ( !libXine->hasVideo() ) { + whichGui = 'a'; + qDebug("HAS AUDIO"); libXine->setShowVideo( false ); - hasAudioChannel=TRUE; + hasAudioChannel = TRUE; } else { + whichGui = 'v'; + qDebug("HAS VIDEO"); libXine->setShowVideo( true ); - hasVideoChannel=TRUE; + hasVideoChannel = TRUE; } // determine if slider is shown mediaPlayerState->setIsStreaming( !libXine->isSeekable() ); // which gui (video / audio) mediaPlayerState->setView( whichGui ); - #if defined(Q_WS_QWS) && !defined(QT_NO_COP) if ( !disabledSuspendScreenSaver ) { disabledSuspendScreenSaver = TRUE; // Stop the screen from blanking and power saving state - QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) + QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << ( whichGui == 'v' ? QPEApplication::Disable : QPEApplication::DisableSuspend ); } #endif @@ -117,17 +123,16 @@ void XineControl::setGamma( int value ) { } void XineControl::stop( bool isSet ) { - if ( !isSet) { - libXine->stop( ); + if ( !isSet ) { + libXine->stop(); #if defined(Q_WS_QWS) && !defined(QT_NO_COP) if ( disabledSuspendScreenSaver ) { disabledSuspendScreenSaver = FALSE; // Re-enable the suspend mode - QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; + QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; } #endif - } } @@ -136,10 +141,10 @@ void XineControl::stop( bool isSet ) { * @isSet */ void XineControl::pause( bool isSet) { - if (isSet) { + if ( isSet ) { libXine->pause(); } else { - libXine->play( m_fileName, 0, m_currentTime); + libXine->play( m_fileName, 0, m_currentTime ); } } @@ -149,7 +154,7 @@ void XineControl::pause( bool isSet) { */ long XineControl::currentTime() { // todo: jede sekunde überprüfen - m_currentTime = libXine->currentTime(); + m_currentTime = libXine->currentTime(); return m_currentTime; QTimer::singleShot( 1000, this, SLOT( currentTime() ) ); } @@ -168,14 +173,15 @@ void XineControl::length() { * @return long the postion in seconds */ long XineControl::position() { - m_position = ( currentTime() ); - mediaPlayerState->updatePosition( m_position ); + m_position = ( currentTime() ); + mediaPlayerState->updatePosition( m_position ); long emitPos = (long)m_position; emit positionChanged( emitPos ); - if(mediaPlayerState->isPlaying) + if( mediaPlayerState->isPlaying ) { // needs to be stopped the media is stopped - QTimer::singleShot( 1000, this, SLOT( position() ) ); -// qDebug("POSITION : %d", m_position); + QTimer::singleShot( 1000, this, SLOT( position() ) ); + } + // qDebug("POSITION : %d", m_position); return m_position; } @@ -184,7 +190,48 @@ long XineControl::position() { * @param isSet */ void XineControl::setFullscreen( bool isSet ) { - libXine->showVideoFullScreen( isSet); + libXine->showVideoFullScreen( isSet ); +} + + +QString XineControl::getMetaInfo() { + + QString returnString; + + if ( !libXine->metaInfo( 0 ).isEmpty() ) { + returnString += tr( " Titel: " + libXine->metaInfo( 0 ) ); + } + + if ( !libXine->metaInfo( 1 ).isEmpty() ) { + returnString += tr( " Comment: " + libXine->metaInfo( 1 ) ); + } + + if ( !libXine->metaInfo( 2 ).isEmpty() ) { + returnString += tr( " Artist: " + libXine->metaInfo( 2 ) ); + } + + if ( !libXine->metaInfo( 3 ).isEmpty() ) { + returnString += tr( " Genre: " + libXine->metaInfo( 3 ) ); + } + + if ( !libXine->metaInfo( 4 ).isEmpty() ) { + returnString += tr( " Album: " + libXine->metaInfo( 4 ) ); + } + + if ( !libXine->metaInfo( 5 ).isEmpty() ) { + returnString += tr( " Year: " + libXine->metaInfo( 5 ) ); + } + return returnString; +} + +QString XineControl::getErrorCode() { + int errorCode = libXine->error(); + + if ( errorCode == 1 ) { + return tr( "No input plugin found for this media type" ); + } else { + return tr( "Some other error" ); + } } /** @@ -192,9 +239,9 @@ void XineControl::setFullscreen( bool isSet ) { * @param second the second to jump to */ void XineControl::seekTo( long second ) { - libXine->play( m_fileName , 0, (int)second ); + libXine->seekTo( (int)second ); } void XineControl::videoResized ( const QSize &s ) { - libXine-> resize ( s ); + libXine->resize( s ); } diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index 1de610b..b1300a8 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h @@ -35,7 +35,6 @@ #define XINECONTROL_H #include "lib.h" -#include "mediadetect.h" #include class XineControl : public QObject { @@ -77,6 +76,18 @@ public slots: */ void nextMedia(); + /** + * Get as much info about the stream from xine as possible + */ + QString getMetaInfo(); + + /** + * get the error code and "translate" it for the user + * + */ + QString getErrorCode(); + + void videoResized ( const QSize &s ); /** @@ -88,7 +99,6 @@ public slots: private: XINE::Lib *libXine; - MediaDetect mdetect; long m_currentTime; long m_position; int m_length; -- cgit v0.9.0.2