author | llornkcor <llornkcor> | 2002-08-03 13:17:17 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-03 13:17:17 (UTC) |
commit | c703646da474df28651ec49d5d649d07f994c614 (patch) (unidiff) | |
tree | fabd01c32565fc851b46446fb2f5a07538b23761 /noncore/multimedia/opieplayer2 | |
parent | 6599cb97da09fc05bbe6e6380c1c0bb128ecb034 (diff) | |
download | opie-c703646da474df28651ec49d5d649d07f994c614.zip opie-c703646da474df28651ec49d5d649d07f994c614.tar.gz opie-c703646da474df28651ec49d5d649d07f994c614.tar.bz2 |
fixed incompatible types
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 8 |
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 | |||
@@ -108,10 +108,9 @@ void XineControl::length() { | |||
108 | mediaPlayerState->setLength( m_length ); | 108 | mediaPlayerState->setLength( m_length ); |
109 | } | 109 | } |
110 | 110 | ||
111 | int XineControl::position() { | 111 | long 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 ); |
116 | long emitPos = (long)m_position; | 115 | long emitPos = (long)m_position; |
117 | emit positionChanged( emitPos ); | 116 | emit positionChanged( emitPos ); |
@@ -127,3 +126,4 @@ void XineControl::setFullscreen( bool isSet ) { | |||
127 | void XineControl::seekTo( long second ) { | 126 | void XineControl::seekTo( long second ) { |
128 | // libXine-> | 127 | // libXine-> |
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 | |||
@@ -43,6 +43,7 @@ class XineControl : public QObject { | |||
43 | public: | 43 | public: |
44 | XineControl( QObject *parent = 0, const char *name =0 ); | 44 | XineControl( QObject *parent = 0, const char *name =0 ); |
45 | ~XineControl(); | 45 | ~XineControl(); |
46 | int m_length; | ||
46 | 47 | ||
47 | public slots: | 48 | public slots: |
48 | void play( const QString& fileName ); | 49 | void play( const QString& fileName ); |
@@ -54,17 +55,16 @@ public slots: | |||
54 | // get length of media file and set it | 55 | // get length of media file and set it |
55 | void length(); | 56 | void length(); |
56 | 57 | ||
57 | int position(); | 58 | long position(); |
58 | 59 | ||
59 | private: | 60 | private: |
60 | XINE::Lib *libXine; | 61 | XINE::Lib *libXine; |
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 | ||
66 | signals: | 66 | signals: |
67 | void positionChanged( long position ); | 67 | void positionChanged( long ); |
68 | 68 | ||
69 | }; | 69 | }; |
70 | 70 | ||