utf8 patch from Nikita V. Youshchenko <yoush@cs.msu.su>

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
@@ -66,8 +66,9 @@ 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);
@@ -96,8 +97,9 @@ void Om3u::readM3u() {
 }
 
 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" ) {
@@ -132,14 +134,15 @@ void Om3u::readPls() { //it's a pls file
 }
 
 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();
 }
 
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
@@ -206,9 +206,9 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
     //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);
 }
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
@@ -59,9 +59,10 @@ 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 ) {
@@ -83,9 +84,10 @@ void Om3u::readM3u() {
 }
 
 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 );
@@ -120,14 +122,15 @@ void Om3u::readPls() { //it's a pls file
 }
 
 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();
 }