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) (show 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
@@ -141,4 +141,5 @@ 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;
}
@@ -146,4 +147,5 @@ int Lib::majorVersion() {
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;
}
@@ -151,4 +153,5 @@ int Lib::minorVersion() {
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;
}
@@ -172,3 +175,3 @@ void Lib::pause() {
-int Lib::speed() {
+int Lib::speed() const {
return xine_get_param ( m_stream, XINE_PARAM_SPEED );
@@ -180,3 +183,3 @@ void Lib::setSpeed( int speed ) {
-int Lib::status() {
+int Lib::status() const {
return xine_get_status( m_stream );
@@ -184,18 +187,21 @@ int Lib::status() {
-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 );
@@ -210,3 +216,3 @@ void Lib::seekTo( int time ) {
-Frame Lib::currentFrame() {
+Frame Lib::currentFrame() const {
Frame frame;
@@ -215,3 +221,3 @@ Frame Lib::currentFrame() {
-QString Lib::metaInfo( int number) {
+QString Lib::metaInfo( int number) const {
return xine_get_meta_info( m_stream, number );
@@ -219,3 +225,3 @@ QString Lib::metaInfo( int number) {
-int Lib::error() {
+int Lib::error() const {
return xine_get_error( m_stream );
@@ -246,3 +252,3 @@ void Lib::setShowVideo( bool video ) {
-bool Lib::isShowingVideo() {
+bool Lib::isShowingVideo() const {
return ::null_is_showing_video( m_videoOutput );
@@ -250,3 +256,3 @@ bool Lib::isShowingVideo() {
-bool Lib::hasVideo() {
+bool Lib::hasVideo() const {
return xine_get_stream_info( m_stream, 18 );
@@ -258,3 +264,3 @@ void Lib::showVideoFullScreen( bool fullScreen ) {
-bool Lib::isVideoFullScreen() {
+bool Lib::isVideoFullScreen() const {
return ::null_is_fullscreen( m_videoOutput );
@@ -272,3 +278,3 @@ void Lib::setGamma( int 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
@@ -63,5 +63,5 @@ namespace XINE {
QCString version();
- int majorVersion()/*const*/;
- int minorVersion()/*const*/;
- int subVersion()/*const*/;
+ static int majorVersion();
+ static int minorVersion();
+ static int subVersion();
@@ -73,6 +73,6 @@ namespace XINE {
int start_time = 0 );
- void stop() /*const*/;
- void pause()/*const*/;
+ void stop();
+ void pause();
- int speed() /*const*/;
+ int speed() const;
@@ -89,11 +89,11 @@ namespace XINE {
- 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;
@@ -107,3 +107,3 @@ namespace XINE {
*/
- bool isShowingVideo() /*const*/;
+ bool isShowingVideo() const;
@@ -117,3 +117,3 @@ namespace XINE {
*/
- bool isVideoFullScreen()/*const*/ ;
+ bool isVideoFullScreen() const;
@@ -133,3 +133,3 @@ namespace XINE {
*/
- QString metaInfo( int number );
+ QString metaInfo( int number ) const;
@@ -138,3 +138,3 @@ namespace XINE {
*/
- bool isScaling();
+ bool isScaling() const;
@@ -149,3 +149,3 @@ namespace XINE {
*/
- bool hasVideo();
+ bool hasVideo() const;
@@ -165,3 +165,3 @@ namespace XINE {
*/
- Frame currentFrame()/*const*/;
+ Frame currentFrame() const;
@@ -174,3 +174,3 @@ namespace XINE {
*/
- int error() /*const*/;
+ int error() const;
@@ -185,4 +185,2 @@ namespace XINE {
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;