fixed incompatible types

2 files changed, 8 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 7337c97..cc1a608 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -99,31 +99,31 @@ void XineControl::pause( bool isSet) {
 
 int XineControl::currentTime() {
     // todo: jede sekunde überprüfen
     m_currentTime =  libXine->currentTime();
     return m_currentTime;
 }
 
 void  XineControl::length() {
     m_length = libXine->length();
     mediaPlayerState->setLength( m_length );
 }
 
-int XineControl::position() {
-    length();
-    qDebug("M_LENGTH :" + m_length);
-    m_position = ( currentTime() /m_length*100);
+long XineControl::position() {
+    qDebug("<<<<<<<<<<<< xinecontrol setPostion>>>>>>>>>");
+    m_position = (m_currentTime/m_length*100);
     mediaPlayerState->setPosition( m_position  );
     long emitPos = (long)m_position;
     emit positionChanged( emitPos );
     QTimer::singleShot( 1000, this, SLOT( position() ) );
     qDebug("POSITION : " +  m_position);
     return m_position;
 }
 
 void XineControl::setFullscreen( bool isSet ) {
     libXine->showVideoFullScreen( isSet);
 }
 
 void XineControl::seekTo( long second ) {
     //  libXine->
 }
+
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 5f3d7c2..07ad309 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -34,39 +34,39 @@
 #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();
+    int m_length;
 
 public slots:
     void play( const QString& fileName );
     void stop( bool );
     void pause( bool );
     void setFullscreen( bool );
     int currentTime();
     void seekTo( long );
     // get length of media file and set it
     void length();
 
-    int position();
+    long position();
 
 private:
     XINE::Lib *libXine;
     MediaDetect mdetect;
-    int m_length;
     int m_currentTime;
-    int m_position;
+    long m_position;
 
 signals:
-    void positionChanged( long position  );
+    void positionChanged( long );
 
 };
 
 
 #endif