- Holger asked for removal of the QCString version() method (the one that

  returns "test" :)

2 files changed, 0 insertions, 7 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 77dab9a..96bdb21 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -111,54 +111,48 @@ Lib::Lib( XineVideoWidget* widget ) {
 
         m_wid->repaint();
     }
 
     m_queue = xine_event_new_queue (m_stream);
 
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
 }
 
 Lib::~Lib() {
 //    free( m_config );
     xine_exit( m_xine );
     /* FIXME either free or delete but valgrind bitches against both */
     //free( m_videoOutput );
     //delete m_audioOutput;
 }
 
 void Lib::resize ( const QSize &s ) {
     if ( s. width ( ) && s. height ( ) ) {
         ::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() {
      int major, minor, sub;
      xine_get_version ( &major, &minor, &sub );
      return major;
 }
 
 int Lib::minorVersion() {
      int major, minor, sub;
      xine_get_version ( &major, &minor, &sub );
      return minor;
 }
 
 int Lib::subVersion() {
      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);
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index a7e51fb..3224cb9 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -39,49 +39,48 @@
 #include <qobject.h>
 
 #include <xine.h>
 //#include "xine.h"
 
 #include "threadutil.h"
 
 class XineVideoWidget;
 
 namespace XINE {
 
     /**
      * Lib wrapps the simple interface
      * 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();
         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();
         void pause();
 
         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
          */