8 files changed, 177 insertions, 49 deletions

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,16 +460,11 @@ 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;
@@ -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);
 }
 
@@ -194,13 +196,19 @@ bool Lib::isSeekable() {
     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() {
@@ -223,6 +231,20 @@ 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 );
 }
@@ -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
@@ -100,31 +100,44 @@ void MediaPlayer::setPlaying( bool play ) {
         fileName = currentFile->name();
         long seconds =  mediaPlayerState->length();//
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-        qDebug(time);
+        //qDebug(time);
         
-    } else { //if playing in file list.. play in a different way
+    } 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);
         
         fileName = playList->currentFileListPathName();
         xineControl->play( fileName);
-        long seconds =  mediaPlayerState->length();//
+        long seconds =  mediaPlayerState->length();
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-        qDebug(time);
-        if( fileName.left(4) != "http" )
+        //qDebug(time);
+        if( fileName.left(4) != "http" ) {
             fileName = QFileInfo( fileName).baseName();
+        }
 
     }
-        if( fileName.left(4) == "http" )
+
+    if( fileName.left(4) == "http" ) {
+       if ( xineControl->getMetaInfo().isEmpty() ) {
             tickerText= tr( " File: " ) + fileName;
-        else
-            tickerText = tr( " File: " ) + fileName + tr(", Length: ") + time;
+       } 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 );
 }
 
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 <harlekin@handhelds.org>
+                             Copyright (c)  2002 LJP <>
+                             Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
+              =.
+            .=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_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     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 <qtimer.h>
+#include <qmessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include "xinecontrol.h"
@@ -43,6 +44,7 @@ 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 & )));
@@ -75,17 +77,22 @@ void XineControl::play( const QString& fileName ) {
 
     //qDebug("<<FILENAME: " + fileName  + ">>>>");
 
-    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;
     } else {
+        whichGui = 'v';
+        qDebug("HAS VIDEO");
         libXine->setShowVideo( true );
         hasVideoChannel=TRUE;
     }
@@ -94,7 +101,6 @@ void XineControl::play( const QString& fileName ) {
     // which gui (video / audio)
     mediaPlayerState->setView( whichGui );
 
-
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( !disabledSuspendScreenSaver ) {
         disabledSuspendScreenSaver = TRUE;
@@ -127,7 +133,6 @@ void XineControl::stop( bool isSet ) {
             QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
         }
 #endif
-
     }
 }
 
@@ -172,9 +177,10 @@ long XineControl::position() {
     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);
     return m_position;
 }
@@ -187,12 +193,53 @@ void XineControl::setFullscreen( bool 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" );
+    }
+}
+
 /**
  * Seek to a position in the track
  * @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 ) {
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 <qobject.h>
 
 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;