summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-08-03 13:17:17 (UTC)
committer llornkcor <llornkcor>2002-08-03 13:17:17 (UTC)
commitc703646da474df28651ec49d5d649d07f994c614 (patch) (side-by-side diff)
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
@@ -105,16 +105,15 @@ int XineControl::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;
@@ -124,6 +123,7 @@ 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
@@ -40,33 +40,33 @@
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