From c703646da474df28651ec49d5d649d07f994c614 Mon Sep 17 00:00:00 2001
From: llornkcor <llornkcor>
Date: Sat, 03 Aug 2002 13:17:17 +0000
Subject: fixed incompatible types

---
(limited to 'noncore/multimedia/opieplayer2')

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
@@ -108,10 +108,9 @@ void  XineControl::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 );
@@ -127,3 +126,4 @@ void XineControl::setFullscreen( bool 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
@@ -43,6 +43,7 @@ class XineControl : public QObject  {
 public:
     XineControl( QObject *parent = 0, const char *name =0 );
     ~XineControl();
+    int m_length;
 
 public slots:
     void play( const QString& fileName );
@@ -54,17 +55,16 @@ public slots:
     // 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 );
 
 };
 
--
cgit v0.9.0.2