mediadetect no longer needed, also beginning of id3 etc tag info support along with some other small fixes

1 files changed, 12 insertions, 2 deletions

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
@@ -26,25 +26,24 @@
   -_. . .   )=.  =           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 XINECONTROL_H
 #define XINECONTROL_H
 
 #include "lib.h"
-#include "mediadetect.h"
 #include <qobject.h>
 
 class XineControl : public QObject  {
     Q_OBJECT
 public:
     XineControl( QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
     bool hasVideo() const { return hasVideoChannel; }
     bool hasAudio() const { return hasAudioChannel; }
 
 public slots:
@@ -68,36 +67,47 @@ public slots:
      */
     long currentTime();
     void seekTo( long );
     // get length of media file and set it
     void length();
     long position();
 
     /**
      * Proceed to the next media file in playlist
      */
     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 );
 
     /**
      * Set the gamma value of the video output
      *  @param int value between -100 and 100, 0 is original
      */
     void setGamma( int );
 
 
 private:
     XINE::Lib *libXine;
-    MediaDetect mdetect;
     long m_currentTime;
     long m_position;
     int m_length;
     QString m_fileName;
     bool disabledSuspendScreenSaver : 1;
     bool hasVideoChannel : 1;
     bool hasAudioChannel : 1;
 
 signals:
     void positionChanged( long );
 
 };