3 files changed, 14 insertions, 8 deletions

diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 8b92a8c..778eb22 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -1,172 +1,175 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         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 "playlistwidget.h"
 #include "om3u.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <qpe/mimetype.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 
 #include <qdir.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qcstring.h>
 
 static inline QString fullBaseName ( const QFileInfo &fi )
 {
   QString str = fi. fileName ( );
   return str. left ( str. findRev ( '.' ));
 }
 
 
 //extern PlayListWidget *playList;
 
 Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
 //qDebug("<<<<<<<new m3u "+filePath);
   f.setName(filePath);
   f.open(mode);
 }
 
 Om3u::~Om3u(){}
 
 void Om3u::readM3u() {
 //    qDebug("<<<<<<reading m3u "+f.name());
    QTextStream t(&f);
+         t.setEncoding(QTextStream::UnicodeUTF8);
    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 = fullBaseName ( f );
             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;
             //                     }
             append(name);
             //                    qDebug(name);
          }
       }
    }
 }
 
 void Om3u::readPls() { //it's a pls file
         QTextStream t( &f );
+                                t.setEncoding(QTextStream::UnicodeUTF8);
         QString s;
         while ( !t.atEnd() ) {
             s = t.readLine();
             if( s.left(4)  == "File" ) {
                 s = s.right( s.length() - 6 );
                 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 = fullBaseName ( f );
                 if( name.left( 4 ) == "http" ) {
                     name = s.right( s.length() - 7);
                 }  else {
                     name = s;
                 }
                 name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
                 if( s.at( s.length() - 4) == '.') // if this is probably a file
                 append(s);
                 else { //if its a url
                     if( name.right( 1 ).find( '/' ) == -1) {
                         s += "/";
                     }
                     append(s);
                 }
             }
         }
 }
 
 void Om3u::write() { //writes list to m3u file
   QString list;
+        QTextStream t(&f);
+  t.setEncoding(QTextStream::UnicodeUTF8);
   if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
        //      qDebug(*it);
-      list += *it+"\n";
+                                t << *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/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 00cfa33..664ec65 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -18,385 +18,385 @@
      +  .  -:.       =       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 <qtextstream.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 )
 {
     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:4096\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( );
 
     QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
     xine_config_load( m_xine, QFile::encodeName( configPath ) );
 
     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 );
 
     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 );
 
     if ( s. width ( ) && s. height ( ) ) {
         ::null_set_gui_width( m_videoOutput,  s. width() );
         ::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() ) ) {
+     if ( !xine_open( m_stream, 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 );
 }
 
 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 );
     if ( time > 0 )  {
         return time/1000;
     } else {
         return 0;
     }
 }
 
 int Lib::length() const {
       assert( m_initialized );
 
       int pos, time, length;
 /* 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;
 };
 
 QString Lib::metaInfo( int number) const {
     assert( m_initialized );
 
     return xine_get_meta_info( m_stream, number );
 }
 
 int Lib::error() const {
     assert( m_initialized );
 
     return xine_get_error( m_stream );
 };
 
 void Lib::ensureInitialized()
 {
     if ( m_initialized )
         return;
 
     qDebug( "waiting for initialization thread to finish" );
     wait();
     qDebug( "initialization thread finished!" );
 }
 
 void Lib::setWidget( XineVideoWidget *widget )
 {
     m_wid = widget;
     resize ( m_wid-> size ( ) );
     ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
     m_wid->repaint();
 }
 
 void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
 {
     assert( sendType == ThreadUtil::Channel::OneWay );
     handleXineEvent( msg->type() );
     delete msg;
 }
 
 void Lib::handleXineEvent( const xine_event_t* t ) {
     send( new ThreadUtil::ChannelMessage( t->type ), OneWay );
 }
 
 void Lib::handleXineEvent( int type ) {
     assert( m_initialized );
 
     if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
         emit stopped();
     }
 }
 
 
 void Lib::setShowVideo( bool video ) {
     assert( m_initialized );
 
     m_video = video;
     ::null_set_show_video( m_videoOutput, video );
 }
 
 bool Lib::isShowingVideo() const {
     assert( m_initialized );
 
     return ::null_is_showing_video( m_videoOutput );
 }
 
 bool Lib::hasVideo() const {
     assert( m_initialized );
 
     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 );
diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 7183fb4..69e87e7 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -1,160 +1,163 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         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 "playlistwidget.h"
 #include "om3u.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <qpe/mimetype.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 
 #include <qdir.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qcstring.h>
 
 //extern PlayListWidget *playList;
 
 Om3u::Om3u( const QString &filePath, int mode)
       : QStringList (){
 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;
+                t.setEncoding(QTextStream::UnicodeUTF8);
+                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
                     QString name;
                     name = s;
                     append(name);
                 }
         }
     }
 }
 
 void Om3u::readPls() { //it's a pls file
         QTextStream t( &f );
-        QString s;
+                                t.setEncoding(QTextStream::UnicodeUTF8);
+                                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();
                 if( name.left( 4 ) == "http" ) {
                     name = s.right( s.length() - 7);
                 }  else {
                     name = s;
                 }
                 name = name.right( name.length() - name.findRev( "\\", -1, TRUE) - 1 );
                 if( s.at( s.length() - 4) == '.') // if this is probably a file
                 append(s);
                 else { //if its a url
 //                     if( name.right( 1 ).find( '/' ) == -1) {
 //                         s += "/";
 //                     }
                     append(s);
                 }
             }
         }
 }
 
 void Om3u::write() { //writes list to m3u file
   QString list;
-  if(count()>0) {
+        QTextStream t(&f);
+  t.setEncoding(QTextStream::UnicodeUTF8);
+ if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
 //      qDebug(*it);
-      list += *it+"\n";
+                                t << *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();
 }