summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-03 13:17:17 (UTC)
committer llornkcor <llornkcor>2002-08-03 13:17:17 (UTC)
commitc703646da474df28651ec49d5d649d07f994c614 (patch) (unidiff)
treefabd01c32565fc851b46446fb2f5a07538b23761
parent6599cb97da09fc05bbe6e6380c1c0bb128ecb034 (diff)
downloadopie-c703646da474df28651ec49d5d649d07f994c614.zip
opie-c703646da474df28651ec49d5d649d07f994c614.tar.gz
opie-c703646da474df28651ec49d5d649d07f994c614.tar.bz2
fixed incompatible types
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h8
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
@@ -110,6 +110,5 @@ void XineControl::length() {
110 110
111int XineControl::position() { 111long XineControl::position() {
112 length(); 112 qDebug("<<<<<<<<<<<< xinecontrol setPostion>>>>>>>>>");
113 qDebug("M_LENGTH :" + m_length); 113 m_position = (m_currentTime/m_length*100);
114 m_position = ( currentTime() /m_length*100);
115 mediaPlayerState->setPosition( m_position ); 114 mediaPlayerState->setPosition( m_position );
@@ -129 +128,2 @@ void XineControl::seekTo( long second ) {
129} 128}
129
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
@@ -45,2 +45,3 @@ public:
45 ~XineControl(); 45 ~XineControl();
46 int m_length;
46 47
@@ -56,3 +57,3 @@ public slots:
56 57
57 int position(); 58 long position();
58 59
@@ -61,8 +62,7 @@ private:
61 MediaDetect mdetect; 62 MediaDetect mdetect;
62 int m_length;
63 int m_currentTime; 63 int m_currentTime;
64 int m_position; 64 long m_position;
65 65
66signals: 66signals:
67 void positionChanged( long position ); 67 void positionChanged( long );
68 68