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
@@ -130,103 +130,109 @@ void Lib::resize ( const QSize &s ) {
         ::null_set_gui_width( m_videoOutput,  s. width() );
         ::null_set_gui_height( m_videoOutput,  s. height() );
     }
 }
 
 QCString Lib::version() {
     //   QCString str( xine_get_str_version() );
     // return str;
     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();
     if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) {
         return 0;
     }
     return xine_play( m_stream, startPos, start_time);
 }
 
 void Lib::stop() {
     qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
     xine_stop( m_stream );
 }
 
 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 ) {
     //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
     // since its now milliseconds we need *1000
     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 )
 {
     assert( sendType == ThreadUtil::Channel::OneWay );
     handleXineEvent( msg->type() );
     delete msg;
 }
 
 void Lib::handleXineEvent( const xine_event_t* t ) {
     send( new ThreadUtil::ChannelMessage( t->type ), OneWay );
@@ -235,51 +241,51 @@ void Lib::handleXineEvent( const xine_event_t* t ) {
 void Lib::handleXineEvent( int type ) {
     if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
         emit stopped();
     }
 }
 
 
 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 ) {
     ::null_set_scaling( m_videoOutput, scale );
 }
 
 void Lib::setGamma( int value ) {
   //qDebug( QString( "%1").arg(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 ) {
     ( (Lib*)user_data)->handleXineEvent( t );
 }
 
 void Lib::xine_display_frame( void* user_data, uint8_t *frame,
                               int width,  int height,  int bytes ) {
     ( (Lib*)user_data)->drawFrame( frame, width, height, bytes );
 }
 
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
@@ -52,148 +52,146 @@ namespace XINE {
      * of libxine for easy every day use
      * This will become a full C++ Wrapper
      * It supports playing, pausing, info,
      * stooping, seeking.
      */
     class Frame;
     class Lib : public ThreadUtil::Channel {
         Q_OBJECT
     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
          * XINE_SPEED_SLOW_4                  1
          * XINE_SPEED_SLOW_2                  2
          * XINE_SPEED_NORMAL                  4
          * XINE_SPEED_FAST_2                  8
          *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
          */
         void setShowVideo(bool video);
 
         /**
          * is we show video
          */
-        bool isShowingVideo() /*const*/;
+        bool isShowingVideo() const;
 
         /**
          *
          */
         void showVideoFullScreen( bool fullScreen );
 
         /**
          *
          */
-        bool isVideoFullScreen()/*const*/ ;
+        bool isVideoFullScreen() const;
 
 
         /**
          * Get the meta info (like author etc) from the stream
          * XINE_META_INFO_TITLE               0
          * XINE_META_INFO_COMMENT             1
          * XINE_META_INFO_ARTIST              2
          * XINE_META_INFO_GENRE               3
          * XINE_META_INFO_ALBUM               4
          * XINE_META_INFO_YEAR                5
          * XINE_META_INFO_VIDEOCODEC          6
          * 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
          */
         void seekTo( int time );
 
         /**
          *
          * @return is media stream has video
          */
-        bool hasVideo();
+        bool hasVideo() const;
 
         /**
          *
          */
         void setScaling( bool );
 
         /**
          * Set the Gamma value for video output
          * @param int the value between -100 and 100, 0 is original
          */
         void setGamma( int );
 
         /**
          * 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();
 
     protected:
         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;
         xine_cfg_entry_t *m_config;
         xine_vo_driver_t *m_videoOutput;
         xine_ao_driver_t* m_audioOutput;
         xine_event_queue_t *m_queue;
 
         void handleXineEvent( const xine_event_t* t );
         void handleXineEvent( int type );
         void drawFrame( uint8_t* frame, int width, int height, int bytes );