30 files changed, 999 insertions, 237 deletions

diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
index 2de15e9..faa041b 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-Pod.control
@@ -1,8 +1,8 @@
 Package: opie-mediaplayer2-skin-Pod
 Files: pics/mediaplayer/skins/Pod
 Priority: optional
 Section: opie/applications
 Maintainer: ljp <llornkcor@handhelds.org>
-Version: $QPE_VERSION-$SUB_VERSION
 Description: Opie Mediaplayer's skin. 
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
index 570b25a..4bc3c60 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default-landscape.control
@@ -1,9 +1,9 @@
 Package: opie-mediaplayer2-skin-default-landscape
 Files: pics/opieplayer2/skins/default_landscape
 Priority: optional
 Section: opie/playerskins
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Landscape skin for opie mediaplayer's
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
index 5cd7509..d076fab 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-default.control
@@ -1,9 +1,9 @@
 Package: opie-mediaplayer2-skin-default
 Files: pics/opieplayer2/skins/default
 Priority: optional
 Section: opie/playerskins
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Default skin for opie mediaplayer's
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
index 0ff1427..ad8c1f8 100644
--- a/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
+++ b/noncore/multimedia/mediaplayerskins/opie-mediaplayer2-skin-techno.control
@@ -1,8 +1,8 @@
 Package: opie-mediaplayer2-skin-techno
 Files: pics/mediaplayer/skins/techno
 Priority: optional
 Section: opie/applications
 Maintainer: ljp <llornkcor@handhelds.org>
-Version: $QPE_VERSION-$SUB_VERSION
 Description: Techno Opie Mediaplayer's skin. Adapted from Qtopia
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 5d929cb..2c54ae6 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -10,62 +10,48 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <opie/oticker.h>
-
-#include <qwidget.h>
-#include <qpixmap.h>
-#include <qbutton.h>
-#include <qpainter.h>
-#include <qframe.h>
-#include <qlayout.h>
-#include <qdir.h>
-#include <stdlib.h>
-#include <stdio.h>
 
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 namespace
 {
 
 const int xo = -2; // movable x offset
 const int yo = 22; // movable y offset
 
 const MediaWidget::SkinButtonInfo skinInfo[] =
 {
     { MediaWidget::Play, "play", MediaWidget::ToggleButton },
     { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
     { MediaWidget::Next, "next", MediaWidget::NormalButton },
     { MediaWidget::Previous, "prev", MediaWidget::NormalButton },
     { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
     { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
     { MediaWidget::Loop, "loop", MediaWidget::ToggleButton },
     { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton },
     { MediaWidget::Forward, "forward", MediaWidget::NormalButton },
     { MediaWidget::Back, "back", MediaWidget::NormalButton }
 };
@@ -169,49 +155,49 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
 
 void AudioWidget::loadSkin()
 {
     loadDefaultSkin( guiInfo() );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
 //    changeTextColor( &songInfo );
 //    songInfo.setBackgroundColor( QColor( 167, 212, 167 ));
 //    songInfo.setFrameStyle( QFrame::NoFrame);
     songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken );
 //    songInfo.setForegroundColor(Qt::white);
 
     slider.setFixedHeight( 20 );
     slider.setMinValue( 0 );
     slider.setMaxValue( 1 );
     slider.setFocusPolicy( QWidget::NoFocus );
     slider.setBackgroundPixmap( backgroundPixmap );
 
 //     Config cofg("qpe");
 //     cofg.setGroup("Appearance");
 //     QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) );
 
     time.setFocusPolicy( QWidget::NoFocus );
     time.setAlignment( Qt::AlignCenter );
-    
+
 //    time.setFrame(FALSE);
 //    changeTextColor( &time );
 
     resizeEvent( 0 );
 }
 
 void AudioWidget::setSeekable( bool isSeekable ) {
 
     if ( !isSeekable ) {
         qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
         if( !slider.isHidden()) {
             slider.hide();
         }
         disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
     } else {
         // this stops the slider from being moved, thus
         // does not stop stream when it reaches the end
         slider.show();
         qDebug( " CONNECT SET POSTION " );
         connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 53dbb88..b436239 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -13,56 +13,49 @@
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef AUDIO_WIDGET_H
 #define AUDIO_WIDGET_H
 
-#include <qpainter.h>
-#include <qdrawutil.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qslider.h>
-#include <qframe.h>
 #include <qlineedit.h>
-#include <qimage.h>
 
 #include <opie/oticker.h>
 
 #include "mediawidget.h"
 
 class QPixmap;
 
 class AudioWidget : public MediaWidget {
     Q_OBJECT
 public:
     AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~AudioWidget();
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
 
     static MediaWidget::GUIInfo guiInfo();
 
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setLooping( bool b) { setToggleButton( Loop, b ); }
     void setPosition( long );
     void setSeekable( bool );
 
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index d04af08..11ad745 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -10,105 +10,111 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <qimage.h>
+
 #include <qtextstream.h>
-#include <qpe/resource.h>
 
-#include <qfile.h>
 #include <qdir.h>
 
 #include <qgfx_qws.h>
 #include <qdirectpainter_qws.h>
 
 #include <assert.h>
 
 #include "xinevideowidget.h"
 #include "frame.h"
 #include "lib.h"
 
 
 typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
                                       int  width, int height,int bytes );
 
 extern "C" {
     xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * );
     int null_is_showing_video( const xine_vo_driver_t* self );
     void null_set_show_video( const xine_vo_driver_t* self, int show );
     int null_is_fullscreen( const xine_vo_driver_t* self );
     void null_set_fullscreen( const xine_vo_driver_t* self, int screen );
     int null_is_scaling( const xine_vo_driver_t* self );
     void null_set_scaling( const xine_vo_driver_t* self, int scale );
     void null_set_gui_width( const xine_vo_driver_t* self, int width );
     void null_set_gui_height( const xine_vo_driver_t* self, int height );
     void null_set_mode( const xine_vo_driver_t* self, int depth,  int rgb  );
     void null_set_videoGamma( const  xine_vo_driver_t* self , int value );
     void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data );
 
     void null_preload_decoders( xine_stream_t *stream );
 }
 
 using namespace XINE;
 
-Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) 
+Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
 {
     m_initialized = false;
     m_duringInitialization = false;
     m_video = false;
     m_wid = widget;
     printf("Lib");
     QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
     // get the configuration
 
     // not really OO, should be an extra class, later
     if ( !QFile::exists(configPath) ) {
         QFile f(configPath);
         f.open(IO_WriteOnly);
         QTextStream ts( &f );
         ts << "misc.memcpy_method:glibc\n";
+        ts << "# uncomment if you experience double speed audio \n #audio.oss_sync_method:softsync\n";
+        ts << "codec.ffmpeg_pp_quality:3\n";
+        ts << "audio.num_buffers:50\n";
+        ts << "audio.size_buffers:4160\n";
+        ts << "video.num_buffers:20\n";
+        ts << "video.size_buffers:4096\n";
+        ts << "audio.out_num_audio_buf:16\n";
+        ts << "audio.out_size_audio_buf:8096\n";
+        ts << "audio.out_size_zero_buf:1024\n";
+        ts << "audio.passthrough_offset:0\n";
         f.close();
     }
 
     if ( initMode == InitializeImmediately ) {
         initialize();
         m_initialized = true;
     }
     else
         start();
 }
 
 void Lib::run()
 {
     qDebug( "Lib::run() started" );
     initialize();
     m_initialized = true;
     qDebug( "Lib::run() finished" );
 }
 
 void Lib::initialize()
 {
     m_duringInitialization = true;
     m_xine =  xine_new( );
 
@@ -118,49 +124,49 @@ void Lib::initialize()
     xine_init( m_xine );
 
     // allocate oss for sound
     // and fb for framebuffer
     m_audioOutput = xine_open_audio_driver( m_xine,  "oss", NULL );
     m_videoOutput = ::init_video_out_plugin( m_xine, NULL, xine_display_frame, this );
 
 
 //xine_open_video_driver( m_xine,  NULL,  XINE_VISUAL_TYPE_FB,  NULL);
 
 
 //    null_display_handler( m_videoOutput, xine_display_frame, this );
 
     m_stream = xine_stream_new (m_xine,  m_audioOutput,  m_videoOutput );
 
     if (m_wid != 0 ) {
         printf( "!0\n" );
         setWidget( m_wid );
     }
 
     m_queue = xine_event_new_queue (m_stream);
 
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
 
-    ::null_preload_decoders( m_stream );
+      ::null_preload_decoders( m_stream );
 
     m_duringInitialization = false;
 }
 
 Lib::~Lib() {
     assert( isRunning() == false );
     assert( m_initialized );
 
 //    free( m_config );
 
     xine_close( m_stream );
 
     xine_event_dispose_queue( m_queue );
 
     xine_dispose( m_stream );
 
     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 ) {
     assert( m_initialized || m_duringInitialization );
@@ -170,50 +176,58 @@ void Lib::resize ( const QSize &s ) {
         ::null_set_gui_height( m_videoOutput,  s. height() );
     }
 }
 
 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 ) {
     assert( m_initialized );
+    // FIXME actually a hack imho. Should not be needed to dispose the whole stream
+    // but without we get wrong media length reads from libxine for the second media
+    //xine_dispose ( m_stream );
 
     QString str = fileName.stripWhiteSpace();
+
+    //m_stream = xine_stream_new (m_xine,  m_audioOutput,  m_videoOutput );
+    //m_queue = xine_event_new_queue (m_stream);
+    //xine_event_create_listener_thread (m_queue, xine_event_handler, this);
+
     if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) {
         return 0;
     }
     return xine_play( m_stream, startPos, start_time);
 }
 
 void Lib::stop() {
     assert( m_initialized );
 
     qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
     xine_stop( m_stream );
 }
 
 void Lib::pause( bool toggle ) {
     assert( m_initialized );
 
     xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
 }
 
 int Lib::speed() const {
     assert( m_initialized );
 
     return  xine_get_param ( m_stream, XINE_PARAM_SPEED );
 }
@@ -222,57 +236,78 @@ void Lib::setSpeed( int speed ) {
     assert( m_initialized );
 
     xine_set_param ( m_stream, XINE_PARAM_SPEED, speed );
 }
 
 int Lib::status() const {
     assert( m_initialized );
 
     return xine_get_status( m_stream );
 }
 
 int Lib::currentPosition() const {
     assert( m_initialized );
 
     int pos, time, length;
     xine_get_pos_length( m_stream, &pos, &time, &length );
     return pos;
 }
 
 int Lib::currentTime() const {
     assert( m_initialized );
 
     int pos, time, length;
     xine_get_pos_length( m_stream, &pos, &time, &length );
-    return time/1000;
+    if ( time > 0 )  {
+        return time/1000;
+    } else {
+        return 0;
+    }
 }
 
 int Lib::length() const {
       assert( m_initialized );
 
       int pos, time, length;
-      xine_get_pos_length( m_stream, &pos, &time, &length );
-      return length/1000;
+/* dilb: patch to solve the wrong stream length reported to the GUI*/
+      int iRetVal=0, iTestLoop=0;
+      
+      do
+              {
+        iRetVal = xine_get_pos_length( m_stream, &pos, &time, &length );
+        if (iRetVal)
+           {/* if the function didn't return 0, then pos, time and length are valid.*/
+           return length/1000;
+           }
+        /*don't poll too much*/
+        usleep(100000);
+        iTestLoop++;
+        }
+      while ( iTestLoop < 10 ); /* if after 1s, we still don't have any
+valid stream, then return -1 (this value could be used to make the stream
+unseekable, but it should never occur!! Mr. Murphy ? :) ) */
+
+      return -1;
 }
 
 bool Lib::isSeekable() const {
     assert( m_initialized );
 
     return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
 }
 
 void Lib::seekTo( int time ) {
     assert( m_initialized );
 
     //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() const {
     assert( m_initialized );
 
     Frame frame;
     return frame;
 };
 
@@ -345,51 +380,49 @@ bool Lib::hasVideo() const {
     return  xine_get_stream_info( m_stream, 18 );
 }
 
 void Lib::showVideoFullScreen( bool fullScreen ) {
     assert( m_initialized );
 
     ::null_set_fullscreen( m_videoOutput, fullScreen );
 }
 
 bool Lib::isVideoFullScreen() const {
     assert( m_initialized );
 
     return ::null_is_fullscreen( m_videoOutput );
 }
 
 void Lib::setScaling( bool scale ) {
     assert( m_initialized );
 
     ::null_set_scaling( m_videoOutput, scale );
 }
 
 void Lib::setGamma( int value ) {
     assert( m_initialized );
 
-  //qDebug( QString( "%1").arg(value)  );
-  /* int gammaValue = ( 100 + value ); */
-  ::null_set_videoGamma( m_videoOutput, value );
+   ::null_set_videoGamma( m_videoOutput, value );
 }
 
 bool Lib::isScaling() const {
     assert( m_initialized );
 
     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 );
 }
 
 void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
     assert( m_initialized );
 
     if ( !m_video ) {
         qWarning("not showing video now");
         return;
     }
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 181735c..0ff14d0 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -13,54 +13,49 @@
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef ZECKEXINELIB_H
 #define ZECKEXINELIB_H
 
-#include <qcstring.h>
-#include <qstring.h>
-#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, private ThreadUtil::Thread
     {
         Q_OBJECT
     public:
         enum InitializationMode { InitializeImmediately, InitializeInThread };
 
         Lib( InitializationMode initMode, XineVideoWidget* = 0);
 
         ~Lib();
diff --git a/noncore/multimedia/opieplayer2/mediadetect.cpp b/noncore/multimedia/opieplayer2/mediadetect.cpp
deleted file mode 100644
index 91137db..0000000
--- a/noncore/multimedia/opieplayer2/mediadetect.cpp
+++ b/dev/null
@@ -1,43 +0,0 @@
-#include <qstring.h>
-#include "mediadetect.h"
-
-
-MediaDetect::MediaDetect() {
-}
-
-MediaDetect::~MediaDetect() {
-}
-
-char MediaDetect::videoOrAudio( const QString& fileName ) {
-    if( (fileName.lower()).right(4) == ".avi" ||
-        (fileName.lower()).right(4) == ".mpg" ||
-        (fileName.lower()).right(4) == ".asf" ||
-        (fileName.lower()).right(4) == ".mov" ||
-        (fileName.lower()).right(5) == ".mpeg"  ) {
-        qDebug("Video out taken");
-        return 'v';
-    } else if ( (fileName.lower()).right(4) == "·mp1" ||
-                (fileName.lower()).right(4) == ".mp3" ||
-                (fileName.lower()).right(4) == ".ogg" ||
-                (fileName.lower()).right(4) == ".wav" ) {
-        qDebug("AUDIO out taken");
-        return 'a';
-    } else if ( (fileName.lower()).left(7) == "http://" &&
-       (fileName.lower()).right(1) == "/" ) {
-        return 'a';
-    } else {
-        return 'f';
-    }
-}
-
-bool MediaDetect::isStreaming( const QString& fileName ) {
-    // ugly
-    if( (fileName.lower()).left(4) == "http" ) {
-        return true;
-    } else if ( (fileName.lower()).left(3) == "ftp" ) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
diff --git a/noncore/multimedia/opieplayer2/mediadetect.h b/noncore/multimedia/opieplayer2/mediadetect.h
deleted file mode 100644
index bd5ea1d..0000000
--- a/noncore/multimedia/opieplayer2/mediadetect.h
+++ b/dev/null
@@ -1,31 +0,0 @@
-
-#ifndef MEDIADETECT_H
-#define MEDIADETECT_H
-
-
-class QString;
-class MediaDetect {
-
-public:
-    MediaDetect();
-    ~MediaDetect();
-
-    /**
-     * Look at the filename and decide which gui is to be used
-     *
-     * @param filename the filename
-     * @return the char - a for audio gui, v for video, f for error
-     */
-    char videoOrAudio( const QString& fileName );
-
-    /**
-     * Find out if it is a streaming media file
-     *
-     * @param filename the filename
-     * @return if it is a streaming url or not
-     */
-    bool isStreaming( const QString& fileName );
-
-};
-
-#endif
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index d4396d2..9f51006 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -1,53 +1,44 @@
 #include <qpe/qpeapplication.h>
-#include <qpe/qlibrary.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qfileinfo.h>
 
-#include <qmainwindow.h>
-#include <qmessagebox.h>
-#include <qwidgetstack.h>
-#include <qfile.h>
-
 #include "mediaplayer.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "volumecontrol.h"
 #include "lib.h"
 
 #include "mediaplayerstate.h"
 
-// for setBacklight()
+ // for setBacklight()
 #include <linux/fb.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
 
-
-
 #define FBIOBLANK             0x4611
 
 MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) {
 
     m_audioUI = 0;
     m_videoUI = 0;
     m_xineControl = 0;
     xine = new XINE::Lib( XINE::Lib::InitializeInThread );
 
     fd=-1;fl=-1;
     playList.setCaption( tr( "OpiePlayer: Initializating" ) );
 
     qApp->processEvents();
     //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
 
 // What is pauseCheck good for? (Simon)
 //    connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
 
     connect( &mediaPlayerState, SIGNAL( next() ), this, SLOT( next() ) );
     connect( &mediaPlayerState, SIGNAL( prev() ), this, SLOT( prev() ) );
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index cbe4d86..34ff064 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -13,51 +13,48 @@
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef MEDIA_PLAYER_H
 #define MEDIA_PLAYER_H
 
-#include <qmainwindow.h>
-#include <qframe.h>
-
 #include "xinecontrol.h"
 
 #include "playlistwidget.h"
 #include "skin.h"
 
 class DocLnk;
 class VolumeControl;
 class MediaPlayerState;
 class AudioWidget;
 class VideoWidget;
 
 namespace XINE
 {
     class Lib;
 };
 
 class MediaPlayer : public QObject {
     Q_OBJECT
 public:
     MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name );
     ~MediaPlayer();
 
 public slots:
     void reloadSkins();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 3953d92..b1f88c9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -1,46 +1,48 @@
 /*
    Copyright (C) 2002 Simon Hausmann <simon@lst.de>
              (C) 2002 Max Reiss <harlekin@handhelds.org>
              (C) 2002 L. Potter <ljp@llornkcor.com>
              (C) 2002 Holger Freyther <zecke@handhelds.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 
+#include <assert.h>
+
 #include "mediawidget.h"
 #include "playlistwidget.h"
 #include "skin.h"
 
 #include <assert.h>
 
 MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
     : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList )
 {
     connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
              this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
     connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
              this, SLOT( setLength( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              this, SLOT( setPlaying( bool ) ) );
 
     setBackgroundMode( NoBackground );
 }
 
 MediaWidget::~MediaWidget()
 {
 }
 
 void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 841d950..7183fb4 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -53,57 +53,51 @@ Om3u::Om3u( const QString &filePath, int mode)
 qDebug("<<<<<<<new m3u "+filePath);
   f.setName(filePath);
   f.open(mode);
 }
 
 Om3u::~Om3u(){}
 
 void Om3u::readM3u() {
 //    qDebug("<<<<<<reading m3u "+f.name());
     QTextStream t(&f);
     QString s;
     while ( !t.atEnd() ) {
         s=t.readLine();
 //                qDebug(s);
         if( s.find( "#", 0, TRUE) == -1 ) {
                 if( s.left(2) == "E:" || s.left(2) == "P:" ) {
                     s = s.right( s.length() -2 );
                     QFileInfo f( s );
                     QString name = f.baseName();
                     name = name.right( name.length() - name.findRev( "\\", -1, TRUE )  -1 );
                     s=s.replace( QRegExp( "\\" ), "/" );
                     append(s);
 //                    qDebug(s);
                 } else { // is url
-                    s.replace( QRegExp( "%20" )," " );
                     QString name;
-//                     if( name.left( 4 ) == "http" ) {
-//                         name = s.right( s.length() - 7 );
-//                     } else {
-                        name = s;
-//                     }
+                    name = s;
                     append(name);
-//                    qDebug(name);
                 }
         }
     }
 }
 
 void Om3u::readPls() { //it's a pls file
         QTextStream t( &f );
         QString s;
         while ( !t.atEnd() ) {
             s = t.readLine();
             if( s.left(4)  == "File" ) {
                 s = s.right( s.length() - s.find("=",0,true)-1 );
                 s = s.stripWhiteSpace();
                 s.replace( QRegExp( "%20" )," ");
 //                qDebug( "adding " + s + " to playlist" );
                 // numberofentries=2
                 // File1=http
                 // Title
                 // Length
                 // Version
                 // File2=http
                 s = s.replace( QRegExp( "\\" ), "/" );
                 QFileInfo f( s );
                 QString name = f.baseName();
@@ -126,41 +120,41 @@ void Om3u::readPls() { //it's a pls file
 }
 
 void Om3u::write() { //writes list to m3u file
   QString list;
   if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
 //      qDebug(*it);
       list += *it+"\n";
     }
     f.writeBlock( list, list.length() );
   }
 //    f.close();
 }
 
 void Om3u::add(const QString &filePath) { //adds to m3u file
     append(filePath);
 }
 
 void Om3u::remove(const QString &filePath) { //removes from m3u list
   QString list, currentFile;
   if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
       currentFile=*it;
       //        qDebug(*it);
-        
+
       if( filePath != currentFile)
         list += currentFile+"\n";
     }
     f.writeBlock( list, list.length() );
   }
 }
 
 void Om3u::deleteFile(const QString &/*filePath*/) {//deletes m3u file
      f.close();
      f.remove();
 
 }
 
 void Om3u::close() { //closes m3u file
     f.close();
 }
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control
new file mode 100644
index 0000000..0e71fc5
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control
@@ -0,0 +1,10 @@
+Package:        opie-mediaplayer2-codecs
+        Files:          root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/*
+Section:        opie/multimedia
+Essential:      no
+Priority:       optional
+Version:        0.7-$SUB_VERSION.3
+Architecture:   arm
+Maintainer:     Maximilian Reiss <harlekin@handhelds.org>
+Depends:        libc6 (>= 2.1), opie-mediaplayer2
+Description:    Codecs for opieplayer 2
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.postinst b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.postinst
new file mode 100755
index 0000000..8e60212
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ "$1" = "configure" ] || exit 1
+
+ldconfig
\ No newline at end of file
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index c072308..10c5d19 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -1,11 +1,11 @@
 Package: opie-mediaplayer2
 Files: bin/opieplayer2  apps/Applications/mediaplayer.desktop pics/opieplayer2/add_to_playlist.png pics/opieplayer2/cut.png pics/opieplayer2/delete.png  pics/opieplayer2/down.png  pics/opieplayer2/loop.png pics/opieplayer2/MPEGPlayer.png pics/opieplayer2/musicfile.png pics/opieplayer2/playlist2.png pics/opieplayer2/play.png pics/opieplayer2/remove_from_playlist.png pics/opieplayer2/shuffle.png  pics/opieplayer2/up.png pics/opieplayer2/videofile.png
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>, Maximilian Reiss <harlekin@handhelds.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
-Depends: task-opie-minimal, libopie1, zlib1g, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer-codecs
+Depends: task-opie-minimal, libopie1, zlib1g, libstdc++2.10-glibc2.2, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape , libxine1 | opie-mediaplayer2-codecs
 Description: The Opie media player
  The mediaplayer for Opie. It plays mp3, mpeg, wav, ogg, quicktime, divx and
  more. Also it is streaming capable.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index 57cd18f..5dabbab 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -1,38 +1,38 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 DESTDIR   = $(OPIEDIR)/bin
 HEADERS   = playlistselection.h mediaplayerstate.h xinecontrol.h \
                videowidget.h audiowidget.h playlistwidget.h om3u.h mediaplayer.h inputDialog.h \
             frame.h lib.h xinevideowidget.h volumecontrol.h playlistwidgetgui.h\
             alphablend.h yuv2rgb.h threadutil.h mediawidget.h playlistview.h playlistfileview.h \
             skin.h
 SOURCES   = main.cpp \
             playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp \
             videowidget.cpp audiowidget.cpp playlistwidget.cpp om3u.cpp mediaplayer.cpp inputDialog.cpp \
             frame.cpp lib.cpp nullvideo.c xinevideowidget.cpp volumecontrol.cpp \
             playlistwidgetgui.cpp\
-            alphablend.c yuv2rgb.c yuv2rgb_arm.c yuv2rgb_arm4l.S \
+            alphablend.c yuv2rgb.c yuv2rgb_arm2.c yuv2rgb_arm4l.S \
             threadutil.cpp mediawidget.cpp playlistview.cpp playlistfileview.cpp \
             skin.cpp
 TARGET    = opieplayer2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS        += -lqpe -lpthread -lopie -lxine -lstdc++
 MOC_DIR   = qpeobj
 OBJECTS_DIR = qpeobj
 
 #INCLUDEPATH += $(OPIEDIR)/include
 #DEPENDPATH  += $(OPIEDIR)/include
 
 
 
 TRANSLATIONS = ../../../i18n/de/opieplayer2.ts \
          ../../../i18n/nl/opieplayer2.ts \
         ../../../i18n/da/opieplayer2.ts \
         ../../../i18n/xx/opieplayer2.ts \
         ../../../i18n/en/opieplayer2.ts \
         ../../../i18n/es/opieplayer2.ts \
         ../../../i18n/fr/opieplayer2.ts \
         ../../../i18n/hu/opieplayer2.ts \
         ../../../i18n/ja/opieplayer2.ts \
         ../../../i18n/ko/opieplayer2.ts \
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 5f750ba..a1a1016 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -10,73 +10,62 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/storage.h>
-#include <qpe/mimetype.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
+#include <qtoolbar.h>
 
 #include <opie/ofiledialog.h>
 
-#include <qdatetime.h>
-#include <qdir.h>
 #include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "om3u.h"
 #include "playlistfileview.h"
 
 //only needed for the random play
-#include <stdlib.h>
 #include <assert.h>
 
 PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
     : PlayListWidgetGui( mediaPlayerState, parent, name ) , currentFileListView( 0 )
 {
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ),
                                       "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected() ) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ),
                                           "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected() ) );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                    this , SLOT( btnPlay( bool) ), TRUE );
     d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
                                    &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ), "opieplayer2/loop",
                                    &mediaPlayerState, SLOT( setLooping( bool ) ), TRUE );
 
     (void)new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all audio files" ),
                         this, SLOT( addAllMusicToList() ) );
     (void)new MenuItem( pmPlayList, tr( "Add all video files" ),
                         this, SLOT( addAllVideoToList() ) );
@@ -646,81 +635,83 @@ void PlayListWidget::openURL() {
         } else {
             lnk.setName( QFileInfo(filename).baseName() ); //sets name
             lnk.setFile( filename ); //sets file name
             d->selectedFiles->addToSelection(  lnk);
             writeCurrentM3u();
             d->selectedFiles->setSelectedItem( lnk.name());
         }
     }
 
 
     delete fileDlg;
 }
 
 
 void PlayListWidget::openFile() {
 
     QString filename, name;
 
     Config cfg( "OpiePlayer" );
     cfg.setGroup("Dialog");
     MimeTypes types;
     QStringList audio, video, all;
     audio << "audio/*";
     audio << "playlist/plain";
+    audio << "application/ogg";
     audio << "audio/x-mpegurl";
 
     video << "video/*";
     video << "playlist/plain";
 
     all += audio;
     all += video;
     types.insert("All Media Files", all );
     types.insert("Audio",  audio );
     types.insert("Video", video );
 
     QString str = OFileDialog::getOpenFileName( 1,
-                  cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"",
-                  types, 0 );
-    if(str.left(2) == "//") str=str.right(str.length()-1);
-    cfg.writeEntry("LastDirectory" ,QFileInfo(str).dirPath());
+                                                cfg.readEntry("LastDirectory",QPEApplication::documentDir()),"",
+                                                types, 0 );
 
+    if(str.left(2) == "//")  {
+        str=str.right(str.length()-1);
+    }
+    cfg.writeEntry( "LastDirectory" ,QFileInfo( str ).dirPath() );
 
     if( !str.isEmpty() ) {
+
         qDebug( "Selected filename is " + str );
         filename = str;
         DocLnk lnk;
-        Config cfg( "OpiePlayer" );
-        cfg.setGroup("PlayList");
 
         if( filename.right( 3) == "m3u" ||  filename.right(3) == "pls" ) {
             readListFromFile( filename );
         } else {
             lnk.setName( QFileInfo(filename).baseName() ); //sets name
             lnk.setFile( filename ); //sets file name
-            d->selectedFiles->addToSelection(  lnk);
+            d->selectedFiles->addToSelection(  lnk );
             writeCurrentM3u();
-            d->selectedFiles->setSelectedItem( lnk.name());
+            d->selectedFiles->setSelectedItem( lnk.name() );
         }
     }
 }
 
 
 void PlayListWidget::readListFromFile( const QString &filename ) {
     qDebug( "read list filename " + filename );
     QFileInfo fi(filename);
     Om3u *m3uList;
     QString s, name;
     m3uList = new Om3u( filename, IO_ReadOnly );
     if(fi.extension(false).find("m3u",0,false) != -1 )
         m3uList->readM3u();
     else if(fi.extension(false).find("pls",0,false) != -1 )
         m3uList->readPls();
 
     DocLnk lnk;
     for ( QStringList::ConstIterator it = m3uList->begin(); it != m3uList->end(); ++it ) {
         s = *it;
         //        qDebug(s);
         if(s.left(4)=="http") {
           lnk.setName( s ); //sets file name
           lnk.setIcon("opieplayer2/musicfile");
           lnk.setFile( s ); //sets file name
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 5230b03..fc305cd 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -13,60 +13,55 @@
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef PLAY_LIST_WIDGET_H
 #define PLAY_LIST_WIDGET_H
 
-#include <qmainwindow.h>
-#include <qpe/applnk.h>
-#include <qtabwidget.h>
-#include <qpe/fileselector.h>
+
 #include <qpushbutton.h>
 #include <qpopupmenu.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include "playlistwidgetgui.h"
 
-
-//class PlayListWidgetPrivate;
 class Config;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidget : public PlayListWidgetGui {
     Q_OBJECT
 public:
     enum TabType { CurrentPlayList, AudioFiles, VideoFiles, PlayLists };
     enum { TabTypeCount = 4 };
 
     struct Entry
     {
         Entry( const QString &_name, const QString &_fileName )
             : name( _name ), file( _fileName ) {}
         Entry( const QString &_fileName )
             : name( _fileName ), file( _fileName ) {}
 
         QString name;
         QString file;
     };
 
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 5fc0c39..293bf45 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -10,93 +10,81 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/qpemenubar.h>
-#include <qpe/qpetoolbar.h>
-#include <qpe/fileselector.h>
+
+#include <qtoolbar.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/storage.h>
-#include <qpe/mimetype.h>
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <qpe/resource.h>
-
-#include <qpopupmenu.h>
-#include <qaction.h>
-#include <qcursor.h>
-#include <qdir.h>
+
 #include <qlayout.h>
+#include <qmenubar.h>
 
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "playlistfileview.h"
 
-//only needed for the random play
-#include <stdlib.h>
-
 #include "mediaplayerstate.h"
 
 PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent, const char* name )
     : QMainWindow( parent, name ), mediaPlayerState( _mediaPlayerState ) {
 
     d = new PlayListWidgetPrivate;
     d->setDocumentUsed = FALSE;
 
     setBackgroundMode( PaletteButton );
     setToolBarsMovable( FALSE );
 
     // Create Toolbar
-    QPEToolBar *toolbar = new QPEToolBar( this );
+    QToolBar *toolbar = new QToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
 
     // Create Menubar
-    QPEMenuBar *menu = new QPEMenuBar( toolbar );
+    QMenuBar *menu = new QMenuBar( toolbar );
     menu->setMargin( 0 );
 
-    bar = new QPEToolBar( this );
+    bar = new QToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
 
     tbDeletePlaylist = new QPushButton( Resource::loadIconSet( "trash" ), "", bar, "close" );
     tbDeletePlaylist->setFlat( TRUE );
     tbDeletePlaylist->setFixedSize( 20, 20 );
 
     tbDeletePlaylist->hide();
 
     pmPlayList = new QPopupMenu( this );
     menu->insertItem( tr( "File" ), pmPlayList );
 
     pmView = new QPopupMenu( this );
     menu->insertItem( tr( "View" ), pmView );
     pmView->isCheckable();
 
     skinsMenu = new QPopupMenu( this );
     pmView->insertItem( tr( "Skins" ), skinsMenu );
     skinsMenu->isCheckable();
 
     gammaMenu = new QPopupMenu( this );
     pmView->insertItem( tr( "Gamma (Video)" ),  gammaMenu );
 
     gammaSlider = new QSlider( QSlider::Vertical,  gammaMenu );
     gammaSlider->setRange( -40, 40 );
@@ -127,49 +115,49 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg
     QGridLayout *Playout = new QGridLayout( playListTab );
     Playout->setSpacing( 2);
     Playout->setMargin( 2);
 
     // Add the playlist area
     QVBox *vbox3 = new QVBox( playListTab );
     d->playListFrame = vbox3;
 
     QHBox *hbox2 = new QHBox( vbox3 );
     d->selectedFiles = new PlayListSelection( hbox2 );
 
     vbox1 = new QVBox( hbox2 );
     QPEApplication::setStylusOperation( d->selectedFiles->viewport(), QPEApplication::RightOnHold );
     QVBox *stretch1 = new QVBox( vbox1 ); // add stretch
 
     Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
 
     QWidget *aTab;
     aTab = new QWidget( tabWidget, "aTab" );
 
     QGridLayout *Alayout = new QGridLayout( aTab );
     Alayout->setSpacing( 2 );
     Alayout->setMargin( 2 );
     // no m3u's here please
-    audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;audio/x-ogg", "opieplayer2/musicfile", aTab, "Audioview" );
+    audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;application/ogg", "opieplayer2/musicfile", aTab, "Audioview" );
     Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
     tabWidget->insertTab( aTab, tr( "Audio" ) );
 
     QPEApplication::setStylusOperation( audioView->viewport(), QPEApplication::RightOnHold );
 
     QWidget *vTab;
     vTab = new QWidget( tabWidget, "vTab" );
 
     QGridLayout *Vlayout = new QGridLayout( vTab );
     Vlayout->setSpacing( 2 );
     Vlayout->setMargin( 2 );
     videoView = new PlayListFileView( "video/*", "opieplayer2/videofile", vTab, "Videoview" );
     Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
 
     QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold );
 
     tabWidget->insertTab( vTab, tr( "Video" ) );
 
     //playlists list
     QWidget *LTab;
     LTab = new QWidget( tabWidget, "LTab" );
     QGridLayout *Llayout = new QGridLayout( LTab );
     Llayout->setSpacing( 2 );
     Llayout->setMargin( 2 );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index c965b0d..c0cd37a 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -14,120 +14,116 @@
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef PLAY_LIST_WIDGET_GUI_H
 #define PLAY_LIST_WIDGET_GUI_H
 
 #include <qmainwindow.h>
-#include <qpe/applnk.h>
 #include <qpe/resource.h>
-#include <qpe/qpemenubar.h>
 
 #include <qtabwidget.h>
 #include <qpe/fileselector.h>
-#include <qpushbutton.h>
-#include <qpopupmenu.h>
 #include <qaction.h>
+#include <qtoolbutton.h>
 #include <qslider.h>
 #include <qlcdnumber.h>
 
 class PlayListWidgetPrivate;
 class PlayListSelection;
 class MediaPlayerState;
 class PlayListFileView;
 
 class Config;
-class QPEToolBar;
+class QToolBar;
 class QListViewItem;
 class QListView;
 class QPoint;
 class QAction;
 class QLabel;
 
 class PlayListWidgetPrivate {
 public:
     QToolButton *tbPlay, *tbFull, *tbLoop,  *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     PlayListSelection *selectedFiles;
     bool setDocumentUsed;
 };
 
 
 class ToolButton : public QToolButton {
     Q_OBJECT
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
         : QToolButton( parent, name ) {
         setTextLabel( name );
         setPixmap( Resource::loadPixmap( icon ) );
         setAutoRaise( TRUE );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
-        QPEMenuToolFocusManager::manager()->addWidget( this );
     }
 };
 
 class MenuItem : public QAction {
 
 public:
     MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
         : QAction( text, QString::null, 0, 0 ) {
         connect( this, SIGNAL( activated() ), handler, slot );
         addTo( parent );
     }
 };
 
 class PlayListWidgetGui : public QMainWindow {
     Q_OBJECT
 public:
     PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~PlayListWidgetGui();
 
 protected:
     QTabWidget * tabWidget;
     PlayListFileView *audioView, *videoView;
     QListView *playlistView;
     QLabel *libString;
     QPopupMenu *pmView ;
     QPopupMenu *gammaMenu;
     QSlider *gammaSlider;
     QLCDNumber *gammaLCD;
     bool fromSetDocument;
     bool insanityBool;
     QString setDocFileRef;
     // retrieve the current playlist entry (media file link)
     QPushButton *tbDeletePlaylist;
     int selected;
     QPopupMenu *pmPlayList;
     FileSelector*  playLists;
     QPopupMenu *skinsMenu;
     PlayListWidgetPrivate *d; // Private implementation data
     QVBox *vbox1;
     QVBox *vbox5;
-    QPEToolBar *bar;
+    QToolBar *bar;
     QWidget *playListTab;
     void setActiveWindow(); // need to handle this to show the right view
     void setView( char );
 
     MediaPlayerState &mediaPlayerState;
 };
 
 #endif
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 755cd22..c829e03 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -10,113 +10,103 @@
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-
-
-#include <qwidget.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qslider.h>
-#include <qdrawutil.h>
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
 #endif
 
 
 namespace
 {
 
 const int xo = 2; // movable x offset
 const int yo = 0; // movable y offset
 
 const MediaWidget::SkinButtonInfo skinInfo[] =
 {
     { MediaWidget::Play, "play", MediaWidget::ToggleButton },
     { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
     { MediaWidget::Next, "fwd", MediaWidget::NormalButton },
     { MediaWidget::Previous, "back", MediaWidget::NormalButton },
     { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
     { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
     { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton }
 };
 
 const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
 
 }
 
-VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 
+VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
     : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false )
 {
     setCaption( tr("OpiePlayer - Video") );
 
     videoFrame = new XineVideoWidget ( this, "Video frame" );
 
     connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & )));
     connect ( videoFrame,  SIGNAL( clicked () ),  this,  SLOT ( backToNormal() ) );
 
     slider = 0;
 
     loadSkin();
 
     setLength( mediaPlayerState.length() );
     setPosition( mediaPlayerState.position() );
     setFullscreen( mediaPlayerState.isFullscreen() );
     setPlaying( mediaPlayerState.isPlaying() );
 }
 
 
-VideoWidget::~VideoWidget() 
+VideoWidget::~VideoWidget()
 {
 }
 
 MediaWidget::GUIInfo VideoWidget::guiInfo()
 {
     return GUIInfo( "V" /* infix */, ::skinInfo, ::buttonCount );
 }
 
 void VideoWidget::resizeEvent( QResizeEvent *e ) {
     int h = height();
     int w = width();
     //int Vh = 160;
     //int Vw = 220;
 
     slider->setFixedWidth( w - 20 );
     slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
     slider->setBackgroundOrigin( QWidget::ParentOrigin );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setBackgroundPixmap( backgroundPixmap );
 
     upperLeftOfButtonMask.rx() = 0;// ( imgUp->width() ) / 2;
     if(w>h)
         upperLeftOfButtonMask.ry() = 0;
     else
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 84bc964..8c6896b 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -13,53 +13,49 @@
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef VIDEO_WIDGET_H
 #define VIDEO_WIDGET_H
 
-#include <qwidget.h>
-#include <qimage.h>
-#include <qpixmap.h>
 #include "xinevideowidget.h"
-
 #include "mediawidget.h"
 
 class QPixmap;
 class QSlider;
 
 class VideoWidget : public MediaWidget {
     Q_OBJECT
 public:
     VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~VideoWidget();
 
     static MediaWidget::GUIInfo guiInfo();
 
     XineVideoWidget* vidWidget();
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setFullscreen( bool b );
     virtual void makeVisible();
     void backToNormal();
     void setPosition( long );
 
 public:
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 1c489e3..a392f4a 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -15,116 +15,117 @@
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
+
 #include "xinecontrol.h"
 #include "mediaplayerstate.h"
 #include "xinevideowidget.h"
 
-XineControl::XineControl( XineVideoWidget *xineWidget, 
-                          MediaPlayerState &_mediaPlayerState, 
+XineControl::XineControl( XineVideoWidget *xineWidget,
+                          MediaPlayerState &_mediaPlayerState,
                           QObject *parent, const char *name )
     : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget )
 {
     libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget );
 
     init();
 }
 
-XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, 
-                          MediaPlayerState &_mediaPlayerState, 
+XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget,
+                          MediaPlayerState &_mediaPlayerState,
                           QObject *parent, const char *name )
     : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget )
 {
     xine->ensureInitialized();
 
     xine->setWidget( xineWidget );
 
     init();
 }
 
 void XineControl::init()
 {
     connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pause( bool ) ) );
     connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) );
     connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ),  this,  SLOT( seekTo( long ) ) );
     connect( &mediaPlayerState,  SIGNAL( videoGammaChanged( int ) ), this,  SLOT( setGamma( int ) ) );
     connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
     connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
 
     disabledSuspendScreenSaver = FALSE;
 }
 
 XineControl::~XineControl() {
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( disabledSuspendScreenSaver ) {
         disabledSuspendScreenSaver = FALSE;
         // Re-enable the suspend mode
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
     }
 #endif
     delete libXine;
 }
 
 void XineControl::play( const QString& fileName ) {
+
     hasVideoChannel = FALSE;
     hasAudioChannel = FALSE;
     m_fileName = fileName;
 
     qDebug("<<FILENAME: " + fileName  + ">>>>");
 
     if ( !libXine->play( fileName, 0, 0 ) ) {
         QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() );
         // toggle stop so the the play button is reset
         mediaPlayerState.setPlaying( false );
         return;
     }
     mediaPlayerState.setPlaying( true );
 
     MediaPlayerState::DisplayType displayType;
-    // qDebug( QString( "libXine->hasVideo() return : %1 ").arg( libXine->hasVideo() ) );
     if ( !libXine->hasVideo() ) {
         displayType = MediaPlayerState::Audio;
         qDebug("HAS AUDIO");
         libXine->setShowVideo( false );
         hasAudioChannel = TRUE;
     } else {
         displayType = MediaPlayerState::Video;
         qDebug("HAS VIDEO");
         libXine->setShowVideo( true );
         hasVideoChannel = TRUE;
     }
     // determine if slider is shown
     mediaPlayerState.setIsSeekable( libXine->isSeekable() );
 
     // which gui (video / audio)
     mediaPlayerState.setDisplayType( displayType );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     if ( !disabledSuspendScreenSaver ) {
         disabledSuspendScreenSaver = TRUE;
         // Stop the screen from blanking and power saving state
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" )
             << ( displayType == MediaPlayerState::Video ? QPEApplication::Disable : QPEApplication::DisableSuspend );
     }
@@ -176,49 +177,48 @@ long XineControl::currentTime() {
 }
 
 /**
  * Set the length of the media file
  */
 void  XineControl::length() {
     m_length = libXine->length();
     mediaPlayerState.setLength( m_length );
 }
 
 
 /**
  * Reports the position the xine backend is at right now
  * @return long the postion in seconds
  */
 long XineControl::position() {
     m_position = ( currentTime() );
     mediaPlayerState.updatePosition( m_position );
     long emitPos = (long)m_position;
     emit positionChanged( emitPos );
     if( mediaPlayerState.isPlaying() ) {
     // needs to be stopped the media is stopped
         QTimer::singleShot( 1000, this, SLOT( position() ) );
     }
-    // qDebug("POSITION : %d", m_position);
     return m_position;
 }
 
 /**
  * Set videoplayback to fullscreen
  * @param isSet
  */
 void XineControl::setFullscreen( bool isSet ) {
     libXine->showVideoFullScreen( isSet );
 }
 
 
 QString XineControl::getMetaInfo() {
 
     QString returnString;
 
     if ( !libXine->metaInfo( 0 ).isEmpty() ) {
         returnString += tr( " Title: " + libXine->metaInfo( 0 ) );
     }
 
     if ( !libXine->metaInfo( 1 ).isEmpty() ) {
         returnString += tr( " Comment: " + libXine->metaInfo( 1 ) );
     }
 
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 0e985d6..3f44f2e 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -14,49 +14,48 @@
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef XINECONTROL_H
 #define XINECONTROL_H
 
 #include "lib.h"
-#include <qobject.h>
 
 #include "mediaplayerstate.h"
 
 class XineControl : public QObject  {
     Q_OBJECT
 public:
     XineControl( XineVideoWidget *xineWidget, 
                  MediaPlayerState &_mediaPlayerState, 
                  QObject *parent = 0, const char *name =0 );
     // note that this constructor takes over ownership of the passed
     // XINE::Lib object.
     XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, 
                  MediaPlayerState &_mediaPlayerState, 
                  QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
     bool hasVideo() const { return hasVideoChannel; }
     bool hasAudio() const { return hasAudioChannel; }
 
 public slots:
     void play( const QString& fileName );
     void stop( bool );
 
     /**
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb_arm2.c b/noncore/multimedia/opieplayer2/yuv2rgb_arm2.c
new file mode 100644
index 0000000..cbd32e8
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/yuv2rgb_arm2.c
@@ -0,0 +1,875 @@
+/*
+ * yuv2rgb_arm2.c
+ * Copyright (C) 2002 Frederic 'dilb' Boulay.
+ * All Rights Reserved.
+ *
+ * Author: Frederic Boulay <dilb@handhelds.org>
+ *
+ * you can redistribute this file and/or modify
+ * it under the terms of the GNU General Public License (version 2)
+ * as published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+ * The function defined in this file, are derived from work done in the xine
+ * project.
+ * In order to improve performance, by strongly reducing memory bandwidth
+ * needed, the scaling functions are merged with the yuv2rgb function.
+ */
+
+#ifdef __arm__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "yuv2rgb.h"
+#include <xine/xineutils.h>
+
+/* Prototypes of the "local" functions available here: */
+/* first prototype, function called when no scaling is needed: */
+static void arm_rgb16_noscale(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*);
+/* second prototype, function called when no horizontal scaling is needed: */
+static void arm_rgb16_step_dx_32768(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*);
+/* third prototype, function called when scaling is needed for zooming in: */
+static void arm_rgb16_step_dx_inf_32768(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*);
+/* fourth prototype, function called when scaling is needed for zooming out (between 1x and 2x): */
+static void arm_rgb16_step_dx_bet_32768_65536(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*);
+/* fifth prototype, function called when scaling is needed for zooming out (greater than 2x): */
+static void arm_rgb16_step_dx_sup_65536(yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*);
+/* sixth prototype, function where the decision of the scaling function to use is made.*/
+static void arm_rgb16_2 (yuv2rgb_t*, uint8_t*, uint8_t*, uint8_t*, uint8_t*);
+
+
+
+
+/* extern function: */
+
+/* Function: */
+void yuv2rgb_init_arm (yuv2rgb_factory_t *this)
+/* This function initialise the member yuv2rgb_fun, if everything is right
+the function optimised for the arm target should be used.*/
+        {
+        if (this->swapped)
+                return; /*no swapped pixel output upto now*/
+
+        switch (this->mode)
+                {
+                case MODE_16_RGB:
+                        this->yuv2rgb_fun = arm_rgb16_2;
+                        break;
+                default:
+                }
+        }
+
+
+
+/* local functions: */
+
+/* Function: */
+static void arm_rgb16_2 (yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
+/* This function takes care of applying the right scaling conversion
+(yuv2rgb is included in each scaling function!)*/
+        {
+        if (!this->do_scale)
+                {
+                arm_rgb16_noscale(this, _dst, _py, _pu, _pv);
+                return;
+                }
+        if (this->step_dx<32768)
+                {
+                arm_rgb16_step_dx_inf_32768(this, _dst, _py, _pu, _pv);
+                return;
+                }
+        if (this->step_dx==32768)
+                {
+                arm_rgb16_step_dx_32768(this, _dst, _py, _pu, _pv);
+                return;
+                }
+        if (this->step_dx<65536)
+                {
+                arm_rgb16_step_dx_bet_32768_65536(this, _dst, _py, _pu, _pv);
+                return;
+                }
+        arm_rgb16_step_dx_sup_65536(this, _dst, _py, _pu, _pv);
+        return;
+        }
+
+
+/* Function: */
+static void arm_rgb16_noscale(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
+/* This function is called when the source and the destination pictures have the same size.
+ In this case, scaling part is not needed.
+ (This code is probably far from being optimised, in particular, the asm
+ generated is not the most efficient, a pure asm version will probably
+ emerge sooner or later). But at least, this version is faster than what
+ was used before.*/
+        {
+        int height;
+
+        height=this->dest_height;
+
+        while (height>0)
+                {
+                uint16_t *r, *g, *b;
+                uint8_t *py, *py2, *pu, *pv;
+                uint16_t *dst, *dst2;
+                int width;
+                register uint8_t p1y, p1u, p1v;
+
+                height-=2;
+                width=this->dest_width;
+                dst = _dst;
+                dst2 = _dst + this->rgb_stride;
+                py = _py;
+                py2 = _py + this->y_stride;
+                pu = _pu;
+                pv = _pv;
+
+                while (width>0)
+                        {
+                        width-=2;
+                        p1y=*py++;
+                        p1u=*pu++;
+                        p1v=*pv++;
+
+                        r = this->table_rV[p1v];
+                        g = (void *) (((uint8_t *)this->table_gU[p1u]) + this->table_gV[p1v]);
+                        b = this->table_bU[p1u];
+
+                        *dst++ = r[p1y] + g[p1y] + b[p1y];
+                        p1y=*py++;
+                        *dst++ = r[p1y] + g[p1y] + b[p1y];
+
+                        p1y=*py2++;
+
+                        *dst2++ = r[p1y] + g[p1y] + b[p1y];
+                        p1y=*py2++;
+                        *dst2++ = r[p1y] + g[p1y] + b[p1y];
+                        }
+                _dst += (this->rgb_stride)<<1;
+                _py += (this->y_stride)<<1;
+                _pu += this->uv_stride;
+                _pv += this->uv_stride;
+                }
+        }
+
+
+/* Function: */
+static void arm_rgb16_step_dx_inf_32768(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
+/* This function is called when the destination picture is bigger than the size
+ of the source picture.
+*/
+        {
+        int recal_uv, height; /* Note about recal_uv: bit0 is for
+applying scale on u and v, bit1 is for increments of u and v pointers.*/
+        int dy;
+
+        dy = 0;
+        height = this->dest_height;
+        recal_uv=1; // 1 for evaluation of scale_line, needed the first time
+
+        while(1)
+                {
+                register int dxy;
+                register int dxuv;
+                register uint8_t p1y, p2y;
+                uint8_t dest1y, dest2y;
+                register uint8_t p1u, p2u;
+                register uint8_t p1v, p2v;
+                uint8_t dest1u;
+                uint8_t dest1v;
+                int width;
+                uint8_t *u_buffer;
+                uint8_t *v_buffer;
+                uint16_t *r, *g, *b;
+                uint8_t *py, *pu, *pv;
+                uint16_t *dst;
+
+                dxy = 0;
+                dxuv = 0;
+                width = this->dest_width;
+                u_buffer=this->u_buffer;
+                v_buffer=this->v_buffer;
+                dst = (uint16_t*)_dst;
+                py = _py;
+                pu = _pu;
+                pv = _pv;
+
+                //proceed with line scaling/conversion
+                if ((recal_uv&1)!=0)
+                        {
+                        recal_uv^=1; //reset bit0.
+                        // init values:
+                        p1u = *pu++;
+                        p2u = *pu++;
+                        p1v = *pv++;
+                        p2v = *pv++;
+                        p1y = *py++;
+                        p2y = *py++;
+
+                        //width loop (compute all data for a line).
+                        while (width>0)
+                                {
+                                // proceed with u and v first (ok, and y too finally :)) [scaling part]:
+                                // evaluate 1u, 1v, and 2y
+                                //block1_uvy
+                                dest1u=p1u + ((dxuv*(p2u-p1u))>>15);
+                                dest1v=p1v + ((dxuv*(p2v-p1v))>>15);
+                                // as u and v are evaluated, better save them now
+                                *u_buffer++ = (uint8_t)dest1u;
+                                *v_buffer++ = (uint8_t)dest1v;
+
+                                dest1y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxuv += this->step_dx;
+                                dxy += this->step_dx;
+                                if (dxuv > 32768)
+                                        {
+                                        dxuv -= 32768;
+                                        p1u = p2u;
+                                        p2u = *pu++; //idee pour asm, cf cas then, un merge est possible!!!
+                                        p1v = p2v;
+                                        p2v = *pv++;
+                                        }
+                                if (dxy > 32768)
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++;
+                                        }
+                                //end block1_uvy
+
+                                //block2_y
+                                dest2y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                if (dxy > 32768)
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!!
+                                        }
+                                //end block2_y
+
+                                // proceed now with YUV2RGB [conversion part]:
+                                // u and v are currently in dest1u and dest1v
+                                // the 2 y are in dest1y and dest2y.
+                                // RGB(0),DST1(0), RGB(1), DST1(1)
+                                r = this->table_rV[dest1v];
+                                g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]);
+                                b = this->table_bU[dest1u];
+
+                                *dst++ = r[dest1y] + g[dest1y] + b[dest1y];
+                                *dst++ = r[dest2y] + g[dest2y] + b[dest2y];
+
+                                width -=2;
+                                }
+                        }
+                else
+                        {
+                        // this case is simple, u and v are already evaluated,
+                        // Note pour moi: r, g et b pourraient etre reutilises!!
+
+                        // init values:
+                        p1y = *py++;
+                        p2y = *py++;
+
+                        //width loop (compute all data for a line).
+                        while (width>0)
+                                {
+                                // proceed with y [scaling part]:
+                                // evaluate 2y
+                                //block1_y
+                                dest1y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                if (dxy > 32768)
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++;
+                                        }
+                                //end block1_uvy
+
+                                //block2_y
+                                dest2y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                if (dxy > 32768)
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!!
+                                        }
+                                //end block2_y
+
+                                // proceed now with YUV2RGB [conversion part]:
+                                // u and v are currently in dest1u and dest1v
+                                // the 2 y are in dest1y and dest2y.
+                                // RGB(0),DST1(0)
+                                dest1u=*u_buffer++;
+                                dest1v=*v_buffer++;
+                                r = this->table_rV[dest1v];
+                                g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]);
+                                b = this->table_bU[dest1u];
+
+                                *dst++ = r[dest1y] + g[dest1y] + b[dest1y];
+                                *dst++ = r[dest2y] + g[dest2y] + b[dest2y];
+
+                                width -=2;
+                                }
+                        }
+                // end of line scaling/conversion
+                dy += this->step_dy;
+                _dst += this->rgb_stride;
+
+                while (--height > 0 && dy < 32768)
+                        {
+                        xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast!
+                        dy += this->step_dy;
+                        _dst += this->rgb_stride;
+                        }
+
+
+                if (height <= 0)
+                        break;
+
+                do
+                        {
+                        dy -= 32768;
+                        _py += this->y_stride;
+
+                        recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/
+
+                        if ((recal_uv&2)==0)
+                                {
+                                _pu += this->uv_stride;
+                                _pv += this->uv_stride;
+                                recal_uv|=1; // if update, then reevaluate scanline!
+                                }
+                        }
+                while( dy>=32768);
+                }
+        }
+
+
+
+/* Function: */
+static void arm_rgb16_step_dx_32768(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
+/* This function is called when the widht of the destination picture is the
+ same as the size of the source picture.
+*/
+        {
+        int recal_uv, height;
+        int dy;
+
+        dy = 0;
+        height=this->dest_height;
+        recal_uv=0;
+
+        while (1)
+                {
+                uint16_t *r, *g, *b;
+                uint8_t *py, *pu, *pv;
+                uint16_t *dst;
+                int width;
+                register uint8_t p1y, p1u, p1v;
+
+                width=this->dest_width;
+                dst = (uint16_t*)_dst;
+                py = _py;
+                pu = _pu;
+                pv = _pv;
+
+                while (width>0)
+                        {
+                        width-=2;
+                        p1y=*py++;
+                        p1u=*pu++;
+                        p1v=*pv++;
+
+                        r = this->table_rV[p1v];
+                        g = (void *) (((uint8_t *)this->table_gU[p1u]) + this->table_gV[p1v]);
+                        b = this->table_bU[p1u];
+
+                        *dst++ = r[p1y] + g[p1y] + b[p1y];
+                        p1y=*py++;
+                        *dst++ = r[p1y] + g[p1y] + b[p1y];
+                        }
+
+
+
+                // end of line scaling/conversion
+                dy += this->step_dy;
+                _dst += this->rgb_stride;
+
+                while (--height > 0 && dy < 32768)
+                        {
+                        xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast!
+                        dy += this->step_dy;
+                        _dst += this->rgb_stride;
+                        }
+
+
+                if (height <= 0)
+                        break;
+
+                do
+                        {
+                        dy -= 32768;
+                        _py += this->y_stride;
+
+                        recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/
+
+                        if ((recal_uv&2)==0)
+                                {
+                                _pu += this->uv_stride;
+                                _pv += this->uv_stride;
+                                recal_uv|=1; // if update, then reevaluate scanline!
+                                }
+                        }
+                while( dy>=32768);
+                }
+        }
+
+
+
+/* Function: */
+static void arm_rgb16_step_dx_bet_32768_65536(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
+/* This function is called when the destination picture is between the size
+ of the source picture, and half its size.
+*/
+        {
+        int recal_uv, height; /* Note about recal_uv: bit0 is for
+applying scale on u and v, bit1 is for increments of u and v pointers.*/
+        int dy;
+
+        dy = 0;
+        height = this->dest_height;
+        recal_uv=1; // 1 for evaluation of scale_line, needed the first time
+
+        while(1)
+                {
+                register int dxy;
+                register int dxuv;
+                register uint8_t p1y, p2y;
+                uint8_t dest1y, dest2y;
+                register uint8_t p1u, p2u;
+                register uint8_t p1v, p2v;
+                uint8_t dest1u;
+                uint8_t dest1v;
+                int width;
+                uint8_t *u_buffer;
+                uint8_t *v_buffer;
+                uint16_t *r, *g, *b;
+                uint8_t *py, *pu, *pv;
+                uint16_t *dst;
+
+                dxy = 0;
+                dxuv = 0;
+                width = this->dest_width;
+                u_buffer=this->u_buffer;
+                v_buffer=this->v_buffer;
+                dst = (uint16_t*)_dst;
+                py = _py;
+                pu = _pu;
+                pv = _pv;
+
+                //proceed with line scaling/conversion
+                if ((recal_uv&1)!=0)
+                        {
+                        recal_uv^=1; //reset bit0.
+                        // init values:
+                        p1u = *pu++;
+                        p2u = *pu++;
+                        p1v = *pv++;
+                        p2v = *pv++;
+                        p1y = *py++;
+                        p2y = *py++;
+
+                        //width loop (compute all data for a line).
+                        while (width>0)
+                                {
+                                // proceed with u and v first (ok, and y too finally :)) [scaling part]:
+                                // evaluate 1u, 1v, and 2y
+                                //block1_uvy
+                                dest1u=p1u + ((dxuv*(p2u-p1u))>>15);
+                                dest1v=p1v + ((dxuv*(p2v-p1v))>>15);
+                                // as u and v are evaluated, better save them now
+                                *u_buffer++ = (uint8_t)dest1u;
+                                *v_buffer++ = (uint8_t)dest1v;
+
+                                dest1y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxuv += this->step_dx;
+                                dxy += this->step_dx;
+                                if (dxuv > 65536)
+                                        {
+                                        dxuv -= 65536;
+                                        p1u = *pu++;
+                                        p2u = *pu++;
+                                        p1v = *pv++;
+                                        p2v = *pv++;
+                                        }
+                                else
+                                        {
+                                        dxuv -= 32768;
+                                        p1u = p2u;
+                                        p2u = *pu++; //idee pour asm, cf cas then, un merge est possible!!!
+                                        p1v = p2v;
+                                        p2v = *pv++;
+                                        }
+                                if (dxy > 65536)
+                                        {
+                                        dxy -= 65536;
+                                        p1y = *py++;
+                                        p2y = *py++;
+                                        }
+                                else
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++;
+                                        }
+                                //end block1_uvy
+
+                                //block2_y
+                                dest2y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                if (dxy > 65536)
+                                        {
+                                        dxy -= 65536;
+                                        p1y = *py++;
+                                        p2y = *py++;
+                                        }
+                                else
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!!
+                                        }
+                                //end block2_y
+
+                                // proceed now with YUV2RGB [conversion part]:
+                                // u and v are currently in dest1u and dest1v
+                                // the 2 y are in dest1y and dest2y.
+                                // RGB(0),DST1(0), RGB(1), DST1(1)
+                                r = this->table_rV[dest1v];
+                                g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]);
+                                b = this->table_bU[dest1u];
+
+                                *dst++ = r[dest1y] + g[dest1y] + b[dest1y];
+                                *dst++ = r[dest2y] + g[dest2y] + b[dest2y];
+
+                                width -=2;
+                                }
+                        }
+                else
+                        {
+                        // this case is simple, u and v are already evaluated,
+                        // Note pour moi: r, g et b pourraient etre reutilises!!
+
+                        // init values:
+                        p1y = *py++;
+                        p2y = *py++;
+
+                        //width loop (compute all data for a line).
+                        while (width>0)
+                                {
+                                // proceed with y [scaling part]:
+                                // evaluate 2y
+                                //block1_y
+                                dest1y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                if (dxy > 65536)
+                                        {
+                                        dxy -= 65536;
+                                        p1y = *py++;
+                                        p2y = *py++;
+                                        }
+                                else
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++;
+                                        }
+                                //end block1_uvy
+
+                                //block2_y
+                                dest2y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                if (dxy > 65536)
+                                        {
+                                        dxy -= 65536;
+                                        p1y = *py++;
+                                        p2y = *py++;
+                                        }
+                                else
+                                        {
+                                        dxy -= 32768;
+                                        p1y = p2y;
+                                        p2y = *py++; // idee pour asm, cf cas then, un merge est possible!!!
+                                        }
+                                //end block2_y
+
+                                // proceed now with YUV2RGB [conversion part]:
+                                // u and v are currently in dest1u and dest1v
+                                // the 2 y are in dest1y and dest2y.
+                                // RGB(0),DST1(0)
+                                dest1u=*u_buffer++;
+                                dest1v=*v_buffer++;
+                                r = this->table_rV[dest1v];
+                                g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]);
+                                b = this->table_bU[dest1u];
+
+                                *dst++ = r[dest1y] + g[dest1y] + b[dest1y];
+                                *dst++ = r[dest2y] + g[dest2y] + b[dest2y];
+
+                                width -=2;
+                                }
+                        }
+                // end of line scaling/conversion
+                dy += this->step_dy;
+                _dst += this->rgb_stride;
+
+                while (--height > 0 && dy < 32768)
+                        {
+                        xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast!
+                        dy += this->step_dy;
+                        _dst += this->rgb_stride;
+                        }
+
+
+                if (height <= 0)
+                        break;
+
+                do
+                        {
+                        dy -= 32768;
+                        _py += this->y_stride;
+
+                        recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/
+
+                        if ((recal_uv&2)==0)
+                                {
+                                _pu += this->uv_stride;
+                                _pv += this->uv_stride;
+                                recal_uv|=1; // if update, then reevaluate scanline!
+                                }
+                        }
+                while( dy>=32768);
+                }
+        }
+
+
+
+/* Function: */
+static void arm_rgb16_step_dx_sup_65536(yuv2rgb_t *this, uint8_t * _dst, uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
+/* This function is called when the destination picture is smaller than half
+ the size of the source picture, and half its size.
+*/
+        {
+        int recal_uv, height; /* Note about recal_uv: bit0 is for
+applying scale on u and v, bit1 is for increments of u and v pointers.*/
+        int dy;
+
+        dy = 0;
+        height = this->dest_height;
+        recal_uv=1; // 1 for evaluation of scale_line, needed the first time
+
+        while(1)
+                {
+                register int dxy;
+                register int dxuv;
+                int offdxy, offdxuv;
+                register uint8_t p1y, p2y;
+                uint8_t dest1y, dest2y;
+                register uint8_t p1u, p2u;
+                register uint8_t p1v, p2v;
+                uint8_t dest1u;
+                uint8_t dest1v;
+                int width;
+                uint8_t *u_buffer;
+                uint8_t *v_buffer;
+                uint16_t *r, *g, *b;
+                uint8_t *py, *pu, *pv;
+                uint16_t *dst;
+
+                dxy = 0;
+                dxuv = 0;
+                width = this->dest_width;
+                u_buffer=this->u_buffer;
+                v_buffer=this->v_buffer;
+                dst = (uint16_t*)_dst;
+                py = _py;
+                pu = _pu;
+                pv = _pv;
+
+                //proceed with line scaling/conversion
+                if ((recal_uv&1)!=0)
+                        {
+                        recal_uv^=1; //reset bit0.
+                        // init values:
+                        p1u = *pu++;
+                        p2u = *pu++;
+                        p1v = *pv++;
+                        p2v = *pv++;
+                        p1y = *py++;
+                        p2y = *py++;
+
+                        //width loop (compute all data for a line).
+                        while (width>0)
+                                {
+                                // proceed with u and v first (ok, and y too finally :)) [scaling part]:
+                                // evaluate 1u, 1v, and 2y
+                                //block1_uvy
+                                dest1u=p1u + ((dxuv*(p2u-p1u))>>15);
+                                dest1v=p1v + ((dxuv*(p2v-p1v))>>15);
+                                // as u and v are evaluated, better save them now
+                                *u_buffer++ = (uint8_t)dest1u;
+                                *v_buffer++ = (uint8_t)dest1v;
+
+                                dest1y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxuv += this->step_dx;
+                                dxy += this->step_dx;
+
+                                offdxuv=((dxuv-1)>>15);
+                                dxuv-=offdxuv<<15;
+                                pu+=offdxuv-2;
+                                pv+=offdxuv-2;
+                                p1u = *pu++;
+                                p2u = *pu++;
+                                p1v = *pv++;
+                                p2v = *pv++;
+                                offdxy=((dxy-1)>>15);
+                                dxy-=offdxy<<15;
+                                py+=offdxy-2;
+                                p1y = *py++;
+                                p2y = *py++;
+
+                                //block2_y
+                                dest2y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                offdxy=((dxy-1)>>15);
+                                dxy-=offdxy<<15;
+                                py+=offdxy-2;
+                                p1y = *py++;
+                                p2y = *py++;
+
+                                // proceed now with YUV2RGB [conversion part]:
+                                // u and v are currently in dest1u and dest1v
+                                // the 2 y are in dest1y and dest2y.
+                                // RGB(0),DST1(0), RGB(1), DST1(1)
+                                r = this->table_rV[dest1v];
+                                g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]);
+                                b = this->table_bU[dest1u];
+
+                                *dst++ = r[dest1y] + g[dest1y] + b[dest1y];
+                                *dst++ = r[dest2y] + g[dest2y] + b[dest2y];
+
+                                width -=2;
+                                }
+                        }
+                else
+                        {
+                        // this case is simple, u and v are already evaluated,
+                        // Note pour moi: r, g et b pourraient etre reutilises!!
+
+                        // init values:
+                        p1y = *py++;
+                        p2y = *py++;
+
+                        //width loop (compute all data for a line).
+                        while (width>0)
+                                {
+                                // proceed with y [scaling part]:
+                                // evaluate 2y
+                                //block1_y
+                                dest1y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                offdxy=((dxy-1)>>15);
+                                dxy-=offdxy<<15;
+                                py+=offdxy-2;
+                                p1y = *py++;
+                                p2y = *py++;
+
+                                //end block1_uvy
+
+                                //block2_y
+                                dest2y=p1y + ((dxy*(p2y-p1y))>>15);
+
+                                dxy += this->step_dx;
+                                offdxy=((dxy-1)>>15);
+                                dxy-=offdxy<<15;
+                                py+=offdxy-2;
+                                p1y = *py++;
+                                p2y = *py++;
+                                //end block2_y
+
+                                // proceed now with YUV2RGB [conversion part]:
+                                // u and v are currently in dest1u and dest1v
+                                // the 2 y are in dest1y and dest2y.
+                                // RGB(0),DST1(0)
+                                dest1u=*u_buffer++;
+                                dest1v=*v_buffer++;
+                                r = this->table_rV[dest1v];
+                                g = (void *) (((uint8_t *)this->table_gU[dest1u]) + this->table_gV[dest1v]);
+                                b = this->table_bU[dest1u];
+
+                                *dst++ = r[dest1y] + g[dest1y] + b[dest1y];
+                                *dst++ = r[dest2y] + g[dest2y] + b[dest2y];
+
+                                width -=2;
+                                }
+                        }
+                // end of line scaling/conversion
+                dy += this->step_dy;
+                _dst += this->rgb_stride;
+
+                while (--height > 0 && dy < 32768)
+                        {
+                        xine_fast_memcpy (_dst, (uint8_t*)_dst-this->rgb_stride, this->dest_width*2); // *2 because of int8 cast!
+                        dy += this->step_dy;
+                        _dst += this->rgb_stride;
+                        }
+
+
+                if (height <= 0)
+                        break;
+
+                do
+                        {
+                        dy -= 32768;
+                        _py += this->y_stride;
+
+                        recal_uv^=2; /*bit 0 for reevaluation of scanline, bit 1 for offset.*/
+
+                        if ((recal_uv&2)==0)
+                                {
+                                _pu += this->uv_stride;
+                                _pv += this->uv_stride;
+                                recal_uv|=1; // if update, then reevaluate scanline!
+                                }
+                        }
+                while( dy>=32768);
+                }
+        }
+
+
+#endif
diff --git a/noncore/multimedia/opierec/opierec.control b/noncore/multimedia/opierec/opierec.control
index 96c1b69..a1a2b7e 100644
--- a/noncore/multimedia/opierec/opierec.control
+++ b/noncore/multimedia/opierec/opierec.control
@@ -1,10 +1,10 @@
-Package: opie-rec
+Package: opierec
 Files: bin/opierec pics/opierec apps/Applications/opierec.desktop 
 Priority: optional
 Section: multimedia/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com>
 Architecture: arm
-Version: 1.5-2
-Depends: task-opie-minimal
+Depends: opie ($QPE_VERSION)
 Description: audio sampling recorder
  A simple audio recording/playing application.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 0307d99..147f63d 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -428,102 +428,102 @@ void QtRec::init() {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 2);
    layout->setMargin( 2);
 
    TabWidget = new QTabWidget( this, "TabWidget" );
    layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7);
    //    TabWidget->setTabShape(QTabWidget::Triangular);
 
    ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
    tab = new QWidget( TabWidget, "tab" );
 
    QGridLayout *layout1 = new QGridLayout( tab);
    layout1->setSpacing( 2);
    layout1->setMargin( 2);
 
    timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" );
    //    timeSlider->setFixedWidth(150);
    layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3);
 //    timeSlider->setTickmarks(QSlider::Above);
 
    timeLabel = new QLabel( tab, "TimeLabel" );
    layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3);
 
    playLabel2 = new QLabel(tab, "PlayLabel2" );
-   playLabel2->setText("Play");
+   playLabel2->setText(tr("Play") );
    playLabel2->setFixedHeight(18);
    layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4);
 
    Stop_PushButton = new QPushButton(  tab, "Stop_PushButton" );
    layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4);
    Stop_PushButton->setFixedSize(22,22);
    Stop_PushButton->setPixmap( image4 );
 
    toBeginningButton = new QPushButton(  tab, "Beginning_PushButton" );
    layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5);
    toBeginningButton->setFixedSize(22,22);
    toBeginningButton->setPixmap( Resource::loadPixmap("fastback") );
 
    toEndButton = new QPushButton(  tab, "End_PushButton" );
    layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6);
    toEndButton->setFixedSize(22,22);
    toEndButton->setPixmap(  Resource::loadPixmap( "fastforward" )  );
 
    QLabel *recLabel2;
    recLabel2 = new QLabel( tab, "recLabel2" );
-   recLabel2->setText("Rec");
+   recLabel2->setText(tr("Rec"));
    recLabel2->setFixedHeight(18);
    layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7);
 
    Rec_PushButton = new QPushButton( tab, "Rec_PushButton" );
    layout1->addMultiCellWidget(  Rec_PushButton, 1, 1, 7, 7);
    Rec_PushButton->setFixedSize(22,22);
    Rec_PushButton->setPixmap( image6 );
 
    t = new QTimer( this );
    connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) );
 
    rewindTimer = new QTimer( this );
    connect( rewindTimer, SIGNAL( timeout() ), SLOT( rewindTimerTimeout() ) );
 
    forwardTimer = new QTimer( this );
    connect( forwardTimer, SIGNAL( timeout() ), SLOT( forwardTimerTimeout() ) );
 
    deleteSoundButton  = new QPushButton( tab, "deleteSoundButton" );
    layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8);
    deleteSoundButton->setText( tr( "Delete" ) );
 
    ListView1 = new QListView( tab, "IconView1" );
    layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8);
 
    ListView1->addColumn( tr( "Name" ) );
    ListView1->setColumnWidth(0,140);
    ListView1->setSorting( 1, false);
    ListView1->addColumn( tr( "Time" ) ); //in seconds
    ListView1->setColumnWidth(1,50);
-   ListView1->addColumn( "Location");
+   ListView1->addColumn( tr("Location") );
    ListView1->setColumnWidth(2,50);
-   ListView1->addColumn( "Date");
+   ListView1->addColumn( tr("Date") );
    ListView1->setColumnWidth(3,63);
 
    ListView1->setColumnWidthMode(0,QListView::Manual);
    ListView1->setColumnAlignment(1,QListView::AlignCenter);
    ListView1->setColumnAlignment(2,QListView::AlignRight);
    ListView1->setColumnAlignment(3,QListView::AlignLeft);
    ListView1->setAllColumnsShowFocus( true );
    QPEApplication::setStylusOperation( ListView1->viewport(),QPEApplication::RightOnHold);
 
    TabWidget->insertTab( tab, tr( "Files" ) );
 
    ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
    tab_3 = new QWidget( TabWidget, "tab_3" );
    ////////////////////////////////////
 
    Layout19 = new QHBoxLayout( tab_3);
    Layout19->setSpacing( 2 );
    Layout19->setMargin( 0 );
 
    Layout18 = new QVBoxLayout(this);
    Layout18->setSpacing( 2 );
    Layout18->setMargin( 0 );
 
    Layout17 = new QHBoxLayout(this);
@@ -573,149 +573,149 @@ void QtRec::init() {
    Layout16 = new QHBoxLayout(this);
    Layout16->setSpacing( 2 );
    Layout16->setMargin( 0 );
 
    dirGroup = new QGroupBox( tab_3, "dirGroup" );
    dirGroup->setTitle( tr( "File Directory" ) );
    dirGroup->setFixedSize(130,50);
 
    directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" );
    directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) );
 
    Layout18->addWidget( dirGroup );
 
    bitGroup = new QGroupBox( tab_3, "bitGroup" );
    bitGroup->setTitle( tr( "Bit Depth" ) );
    bitGroup->setFixedSize(65,50);
 
    bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" );
    bitRateComboBox->insertItem( tr( "16" ) );
    bitRateComboBox->insertItem( tr( "8" ) );
    bitRateComboBox->setGeometry( QRect( 5, 20, 50, 25 ) );
 
    Layout18->addWidget( bitGroup );
 
-   compressionCheckBox = new QCheckBox ( "Wave Compression (smaller files)", tab_3 );
+   compressionCheckBox = new QCheckBox ( tr("Wave Compression (smaller files)"), tab_3 );
    Layout18->addWidget( compressionCheckBox );
 
-   autoMuteCheckBox= new QCheckBox ( "auto Mute", tab_3 );
+   autoMuteCheckBox= new QCheckBox ( tr("auto Mute"), tab_3 );
    Layout18->addWidget( autoMuteCheckBox );
 
    Layout19->addLayout( Layout18 );
 
    QWidget *d = QApplication::desktop();
    int width=d->width();
    int height=d->height();
 
 
 
    if( width < height) {
 
       tab_5 = new QWidget( TabWidget, "tab_5" );
 
       QHBoxLayout *Layout19a;
       Layout19a = new QHBoxLayout( tab_5);
       Layout19a->setSpacing( 2 );
       Layout19a->setMargin( 0 );
 
 
       Layout15 = new QVBoxLayout(this);
       Layout15->setSpacing( 2 );
       Layout15->setMargin( 0 );
 
       Layout15b = new QVBoxLayout(this);
       Layout15b->setSpacing( 2 );
       Layout15b->setMargin( 0 );
 
       TextLabel2 = new QLabel( tab_5, "InputLabel" );
       TextLabel2->setText( tr( "In"));
       TextLabel2->setFixedWidth(35);
       Layout15->addWidget( TextLabel2 );
 
       TextLabel3 = new QLabel( tab_5, "OutputLabel" );
       TextLabel3->setText( tr( "Out" ) );
       Layout15b->addWidget( TextLabel3 );
 
       InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" );
       InputSlider->setTickmarks(QSlider::Both);
       Layout15->addWidget( InputSlider);
 
       OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" );
       OutputSlider->setTickmarks(QSlider::Both);
 
       Layout15b->addWidget( OutputSlider );
 
-      outMuteCheckBox = new QCheckBox ( "mute", tab_5 );
+      outMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 );
       Layout15->addWidget( outMuteCheckBox );
 
-      inMuteCheckBox = new QCheckBox ( "mute", tab_5 );
+      inMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 );
       inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
       Layout15b->addWidget( inMuteCheckBox );
 
 
       Layout19a->addLayout( Layout15 );
       Layout19a->addLayout( Layout15b );
 
       fillDirectoryCombo();
 
       TabWidget->insertTab( tab_3, tr( "Options" ) );
 
       TabWidget->insertTab( tab_5, tr( "Volume" ) );
 
    } else {// landscape
 
       //  Layout16->addWidget( dirGroup );
       //  Layout18->addLayout( Layout16 );
       Layout15 = new QVBoxLayout(this);
       Layout15->setSpacing( 2 );
       Layout15->setMargin( 0 );
 
       Layout15b = new QVBoxLayout(this);
       Layout15b->setSpacing( 2 );
       Layout15b->setMargin( 0 );
 
       TextLabel2 = new QLabel( tab_3, "InputLabel" );
       TextLabel2->setText( tr( "In"));
       TextLabel2->setFixedWidth(35);
       Layout15->addWidget( TextLabel2 );
 
       TextLabel3 = new QLabel( tab_3, "OutputLabel" );
       TextLabel3->setText( tr( "Out" ) );
       Layout15b->addWidget( TextLabel3 );
 
       InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" );
       //   InputSlider->setTickmarks(QSlider::Both);
       Layout15->addWidget( InputSlider);
 
       OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" );
       //   OutputSlider->setTickmarks(QSlider::Both);
 
       Layout15b->addWidget( OutputSlider );
 
-      outMuteCheckBox = new QCheckBox ( "mute", tab_3 );
+      outMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 );
       Layout15->addWidget( outMuteCheckBox );
 
-      inMuteCheckBox = new QCheckBox ( "mute", tab_3 );
+      inMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 );
       inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
       Layout15b->addWidget( inMuteCheckBox );
 
 
       Layout19->addLayout( Layout15 );
       Layout19->addLayout( Layout15b );
 
       fillDirectoryCombo();
 
       TabWidget->insertTab( tab_3, tr( "Options" ) );
 
    }
 
 
    ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
 
 //    tab_4 = new QWidget( TabWidget, "tab_4" );
 //    QGridLayout *layout4 = new QGridLayout( tab_4);
 //    layout4->setSpacing( 2);
 //    layout4->setMargin( 2);
 //    TabWidget->insertTab( tab_4, tr( "Help"));
 
 //    ///////////////////////////////////////////// FIXME change to a real helpfile path
 //    QString url="/index.html";
@@ -854,84 +854,84 @@ void QtRec::initConfig() {
    cofg.setGroup( "Volume");
    outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0));
    inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
 }
 
 //================
 
 void QtRec::stop() {
    qDebug("<<<<<<<<<stop()");
    setRecordButton(false);
    monitoring=false;
    stopped=true;
 
    if( !recording)
       endPlaying();
    else
       endRecording();
    timeSlider->setValue(0);
    //    QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << true;  // mute device
 }
 
 void QtRec::doPlayBtn() {
 
    if(!stopped) {
-      playLabel2->setText("Play");
+      playLabel2->setText(tr("Play"));
       stop();
    } else {
       if(ListView1->currentItem() == 0) return;
-      playLabel2->setText("Stop");
+      playLabel2->setText(tr("Stop"));
       currentFile = ListView1->currentItem()->text(0);
       start();
    }
 }
 
 void QtRec::start() { //play
    if(stopped) {
       qDebug("start::");
       QPixmap image3( ( const char** ) image3_data );
       Stop_PushButton->setPixmap( image3 );
       Stop_PushButton->setDown(true);
       stopped=false;
       paused=false;
       secCount=1;
 
       if( openPlayFile())
          if( setupAudio( false))  //recording is false
             doPlay();
    }
 }
 
 bool QtRec::rec() { //record
    qDebug("rec()");
    if(!stopped) {
       qDebug("rec:: !stopped");
       monitoring=true;
       return false;
    } else {
       qDebug("go ahead and record");
       secCount=1;
-      playLabel2->setText("Stop");
+      playLabel2->setText(tr("Stop"));
       monitoring=false;
       setRecordButton(true);
       stopped=false;
 
       if( setupAudio( true))
          if(setUpFile())  {
             qDebug("Ok to start recording");
             int fileSize=0;
             Config cfg("OpieRec");
             cfg.setGroup("Settings");
             qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d",
                     soundDevice->getDeviceBits(),
                     soundDevice->getDeviceRate(),
                     soundDevice->getDeviceChannels());
 
             //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
             qDebug("sample rate is %d", filePara.sampleRate);
             filePara.SecondsToRecord = getCurrentSizeLimit();
 
             qDebug("size limit %d sec", filePara.SecondsToRecord);
             int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
 
             if( filePara.SecondsToRecord == 0) {
                fileSize = diskSize;
@@ -2138,57 +2138,57 @@ QString QtRec::getStorage(const QString &fileName) {
       //    qDebug(name);
    }
    return storage;
    //      struct mntent *me;
    //  //     if(fileName == "/etc/mtab") {
    //      FILE *mntfp = setmntent( fileName.latin1(), "r" );
    //      if ( mntfp ) {
    //          while ( (me = getmntent( mntfp )) != 0 ) {
    //              QString filesystemType = me->mnt_type;
 
    //          }
    //      }
    //      endmntent( mntfp );
 }
 
 void QtRec::setRecordButton(bool b) {
 
    if(b) { //about to record or play
 
       Rec_PushButton->setDown(true);
       QPixmap image3( ( const char** ) image3_data );
       Stop_PushButton->setPixmap( image3 );
       if(Stop_PushButton->isDown())
          Stop_PushButton->setDown(true);
-      playLabel2->setText("Stop");
+      playLabel2->setText(tr("Stop") );
 
    } else { //about to stop
 
       QPixmap image4( ( const char** ) image4_data );
       Stop_PushButton->setPixmap( image4);
       if(Stop_PushButton->isDown())
          Stop_PushButton->setDown(false);
-      playLabel2->setText("Play");
+      playLabel2->setText(tr("Play") );
       if(Rec_PushButton->isDown())
          Rec_PushButton->setDown( false);
    }
 }
 
 void QtRec::fillDirectoryCombo() {
    if( directoryComboBox->count() > 0)
       directoryComboBox->clear();
    int index=0;
    Config cfg("OpieRec");
    cfg.setGroup("Settings");
    QString dir= cfg.readEntry("directory", "/");
    StorageInfo storageInfo;
    const QList<FileSystem> &fs = storageInfo.fileSystems();
    QListIterator<FileSystem> it ( fs );
    QString storage;
    for( ; it.current(); ++it ){
       const QString name = (*it)->name();
       const QString path = (*it)->path();
       //    directoryComboBox->insertItem(name+" "+path);
       directoryComboBox->insertItem(name);
       if(path==dir)
          directoryComboBox->setCurrentItem(index);
       index++;
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index 9dacd94..c543335 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -1,11 +1,11 @@
 Package: opie-showimg
 Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: Image Viewer
  The image viewer for the Opie environment. Supports
  Whichever formats are compiled into Qt/Embedded (eg. PNG).
+Version: $QPE_VERSION$EXTRAVERSION