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
@@ -103,27 +103,27 @@ int XineControl::currentTime() {
103 return m_currentTime; 103 return m_currentTime;
104} 104}
105 105
106void XineControl::length() { 106void XineControl::length() {
107 m_length = libXine->length(); 107 m_length = libXine->length();
108 mediaPlayerState->setLength( m_length ); 108 mediaPlayerState->setLength( m_length );
109} 109}
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 );
116 long emitPos = (long)m_position; 115 long emitPos = (long)m_position;
117 emit positionChanged( emitPos ); 116 emit positionChanged( emitPos );
118 QTimer::singleShot( 1000, this, SLOT( position() ) ); 117 QTimer::singleShot( 1000, this, SLOT( position() ) );
119 qDebug("POSITION : " + m_position); 118 qDebug("POSITION : " + m_position);
120 return m_position; 119 return m_position;
121} 120}
122 121
123void XineControl::setFullscreen( bool isSet ) { 122void XineControl::setFullscreen( bool isSet ) {
124 libXine->showVideoFullScreen( isSet); 123 libXine->showVideoFullScreen( isSet);
125} 124}
126 125
127void XineControl::seekTo( long second ) { 126void 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
@@ -38,35 +38,35 @@
38#include "mediadetect.h" 38#include "mediadetect.h"
39#include <qobject.h> 39#include <qobject.h>
40 40
41class XineControl : public QObject { 41class XineControl : public QObject {
42 Q_OBJECT 42 Q_OBJECT
43public: 43public:
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
47public slots: 48public slots:
48 void play( const QString& fileName ); 49 void play( const QString& fileName );
49 void stop( bool ); 50 void stop( bool );
50 void pause( bool ); 51 void pause( bool );
51 void setFullscreen( bool ); 52 void setFullscreen( bool );
52 int currentTime(); 53 int currentTime();
53 void seekTo( long ); 54 void seekTo( long );
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
59private: 60private:
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
66signals: 66signals:
67 void positionChanged( long position ); 67 void positionChanged( long );
68 68
69}; 69};
70 70
71 71
72#endif 72#endif