summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 11:21:24 (UTC)
committer simon <simon>2002-12-02 11:21:24 (UTC)
commit5a7c8386e4d526558becf2553912eb42a42107ee (patch) (side-by-side diff)
treebe3ebf33bf8cff012c25883adeda9427f4787698
parentb2532533a8a28680db967a45090a3ba1dd53ed73 (diff)
downloadopie-5a7c8386e4d526558becf2553912eb42a42107ee.zip
opie-5a7c8386e4d526558becf2553912eb42a42107ee.tar.gz
opie-5a7c8386e4d526558becf2553912eb42a42107ee.tar.bz2
- made the version functions static and some other functions constant that
are constant by design
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp56
-rw-r--r--noncore/multimedia/opieplayer2/lib.h38
2 files changed, 49 insertions, 45 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 1ac9809..77dab9a 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -138,20 +138,23 @@ QCString Lib::version() {
return "test";
}
int Lib::majorVersion() {
- xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
- return m_major_version;
+ int major, minor, sub;
+ xine_get_version ( &major, &minor, &sub );
+ return major;
}
int Lib::minorVersion() {
- xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
- return m_minor_version;
+ int major, minor, sub;
+ xine_get_version ( &major, &minor, &sub );
+ return minor;
}
int Lib::subVersion() {
- xine_get_version ( &m_major_version, &m_minor_version, &m_sub_version );
- return m_sub_version;
+ int major, minor, sub;
+ xine_get_version ( &major, &minor, &sub );
+ return sub;
}
int Lib::play( const QString& fileName, int startPos, int start_time ) {
QString str = fileName.stripWhiteSpace();
@@ -169,36 +172,39 @@ void Lib::stop() {
void Lib::pause() {
xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
}
-int Lib::speed() {
+int Lib::speed() const {
return xine_get_param ( m_stream, XINE_PARAM_SPEED );
}
void Lib::setSpeed( int speed ) {
xine_set_param ( m_stream, XINE_PARAM_SPEED, speed );
}
-int Lib::status() {
+int Lib::status() const {
return xine_get_status( m_stream );
}
-int Lib::currentPosition() {
- xine_get_pos_length( m_stream, &m_pos, &m_time, &m_length );
- return m_pos;
+int Lib::currentPosition() const {
+ int pos, time, length;
+ xine_get_pos_length( m_stream, &pos, &time, &length );
+ return pos;
}
-int Lib::currentTime() {
- xine_get_pos_length( m_stream, &m_pos, &m_time, &m_length );
- return m_time/1000;
+int Lib::currentTime() const {
+ int pos, time, length;
+ xine_get_pos_length( m_stream, &pos, &time, &length );
+ return time/1000;
}
-int Lib::length() {
- xine_get_pos_length( m_stream, &m_pos, &m_time, &m_length );
- return m_length/1000;
+int Lib::length() const {
+ int pos, time, length;
+ xine_get_pos_length( m_stream, &pos, &time, &length );
+ return length/1000;
}
-bool Lib::isSeekable() {
+bool Lib::isSeekable() const {
return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
}
void Lib::seekTo( int time ) {
@@ -207,18 +213,18 @@ void Lib::seekTo( int time ) {
xine_play( m_stream, 0, time*1000 );
}
-Frame Lib::currentFrame() {
+Frame Lib::currentFrame() const {
Frame frame;
return frame;
};
-QString Lib::metaInfo( int number) {
+QString Lib::metaInfo( int number) const {
return xine_get_meta_info( m_stream, number );
}
-int Lib::error() {
+int Lib::error() const {
return xine_get_error( m_stream );
};
void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
@@ -243,21 +249,21 @@ void Lib::setShowVideo( bool video ) {
m_video = video;
::null_set_show_video( m_videoOutput, video );
}
-bool Lib::isShowingVideo() {
+bool Lib::isShowingVideo() const {
return ::null_is_showing_video( m_videoOutput );
}
-bool Lib::hasVideo() {
+bool Lib::hasVideo() const {
return xine_get_stream_info( m_stream, 18 );
}
void Lib::showVideoFullScreen( bool fullScreen ) {
::null_set_fullscreen( m_videoOutput, fullScreen );
}
-bool Lib::isVideoFullScreen() {
+bool Lib::isVideoFullScreen() const {
return ::null_is_fullscreen( m_videoOutput );
}
void Lib::setScaling( bool scale ) {
@@ -269,9 +275,9 @@ void Lib::setGamma( int value ) {
/* int gammaValue = ( 100 + value ); */
::null_set_videoGamma( m_videoOutput, value );
}
-bool Lib::isScaling() {
+bool Lib::isScaling() const {
return ::null_is_scaling( m_videoOutput );
}
void Lib::xine_event_handler( void* user_data, const xine_event_t* t ) {
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 75b9f12..a7e51fb 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -60,22 +60,22 @@ namespace XINE {
public:
Lib(XineVideoWidget* = 0);
~Lib();
QCString version();
- int majorVersion()/*const*/;
- int minorVersion()/*const*/;
- int subVersion()/*const*/;
+ static int majorVersion();
+ static int minorVersion();
+ static int subVersion();
void resize ( const QSize &s );
int play( const QString& fileName,
int startPos = 0,
int start_time = 0 );
- void stop() /*const*/;
- void pause()/*const*/;
+ void stop();
+ void pause();
- int speed() /*const*/;
+ int speed() const;
/**
* Set the speed of the stream, if codec supports it
* XINE_SPEED_PAUSE 0
@@ -86,17 +86,17 @@ namespace XINE {
*XINE_SPEED_FAST_4 16
*/
void setSpeed( int speed = XINE_SPEED_PAUSE );
- int status() /*const*/;
+ int status() const;
- int currentPosition()/*const*/;
+ int currentPosition()const;
//in seconds
- int currentTime()/*const*/;
+ int currentTime()const;
- int length() /*const*/;
+ int length() const;
- bool isSeekable()/*const*/;
+ bool isSeekable()const;
/**
* Whether or not to show video output
*/
@@ -104,9 +104,9 @@ namespace XINE {
/**
* is we show video
*/
- bool isShowingVideo() /*const*/;
+ bool isShowingVideo() const;
/**
*
*/
@@ -114,9 +114,9 @@ namespace XINE {
/**
*
*/
- bool isVideoFullScreen()/*const*/ ;
+ bool isVideoFullScreen() const;
/**
* Get the meta info (like author etc) from the stream
@@ -130,14 +130,14 @@ namespace XINE {
* XINE_META_INFO_AUDIOCODEC 7
* XINE_META_INFO_SYSTEMLAYER 8
* XINE_META_INFO_INPUT_PLUGIN 9
*/
- QString metaInfo( int number );
+ QString metaInfo( int number ) const;
/**
*
*/
- bool isScaling();
+ bool isScaling() const;
/**
* seek to a position
*/
@@ -146,9 +146,9 @@ namespace XINE {
/**
*
* @return is media stream has video
*/
- bool hasVideo();
+ bool hasVideo() const;
/**
*
*/
@@ -162,18 +162,18 @@ namespace XINE {
/**
* test
*/
- Frame currentFrame()/*const*/;
+ Frame currentFrame() const;
/**
* Returns the error code
* XINE_ERROR_NONE 0
* XINE_ERROR_NO_INPUT_PLUGIN 1
* XINE_ERROR_NO_DEMUXER_PLUGIN 2
* XINE_ERROR_DEMUXER_FAILED 3
*/
- int error() /*const*/;
+ int error() const;
signals:
void stopped();
@@ -182,10 +182,8 @@ namespace XINE {
virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType );
private:
int m_bytes_per_pixel;
- int m_length, m_pos, m_time;
- int m_major_version, m_minor_version, m_sub_version;
bool m_video:1;
XineVideoWidget *m_wid;
xine_t *m_xine;
xine_stream_t *m_stream;