| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 56 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 38 |
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 @@ -139,18 +139,21 @@ QCString Lib::version() { } 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 ) { @@ -170,7 +173,7 @@ 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 ); } @@ -178,26 +181,29 @@ 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 ); } @@ -208,16 +214,16 @@ void Lib::seekTo( int time ) { } -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 ); }; @@ -244,11 +250,11 @@ void Lib::setShowVideo( bool 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 ); } @@ -256,7 +262,7 @@ void Lib::showVideoFullScreen( bool fullScreen ) { ::null_set_fullscreen( m_videoOutput, fullScreen ); } -bool Lib::isVideoFullScreen() { +bool Lib::isVideoFullScreen() const { return ::null_is_fullscreen( m_videoOutput ); } @@ -270,7 +276,7 @@ void Lib::setGamma( int value ) { ::null_set_videoGamma( m_videoOutput, value ); } -bool Lib::isScaling() { +bool Lib::isScaling() const { return ::null_is_scaling( m_videoOutput ); } 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 @@ -61,9 +61,9 @@ namespace XINE { 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 ); @@ -71,10 +71,10 @@ namespace XINE { 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 @@ -87,15 +87,15 @@ namespace XINE { */ 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 @@ -105,7 +105,7 @@ namespace XINE { /** * is we show video */ - bool isShowingVideo() /*const*/; + bool isShowingVideo() const; /** * @@ -115,7 +115,7 @@ namespace XINE { /** * */ - bool isVideoFullScreen()/*const*/ ; + bool isVideoFullScreen() const; /** @@ -131,12 +131,12 @@ namespace XINE { * 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 @@ -147,7 +147,7 @@ namespace XINE { * * @return is media stream has video */ - bool hasVideo(); + bool hasVideo() const; /** * @@ -163,7 +163,7 @@ namespace XINE { /** * test */ - Frame currentFrame()/*const*/; + Frame currentFrame() const; /** * Returns the error code @@ -172,7 +172,7 @@ namespace XINE { * XINE_ERROR_NO_DEMUXER_PLUGIN 2 * XINE_ERROR_DEMUXER_FAILED 3 */ - int error() /*const*/; + int error() const; signals: @@ -183,8 +183,6 @@ namespace XINE { 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; |