1 files changed, 5 insertions, 12 deletions

diff --git a/noncore/multimedia/opieplayer2/om3u.cpp b/noncore/multimedia/opieplayer2/om3u.cpp
index 790fa09..f2a01d3 100644
--- a/noncore/multimedia/opieplayer2/om3u.cpp
+++ b/noncore/multimedia/opieplayer2/om3u.cpp
@@ -29,28 +29,31 @@
 
 */
 
 #include "om3u.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 //extern PlayListWidget *playList;
 
 Om3u::Om3u( const QString &filePath, int mode)
-      : QStringList (){
+  : QStringList ()
+{
 odebug << "<<<<<<<new m3u "+filePath << oendl; 
   f.setName(filePath);
-  f.open(mode);
+    if (!f.open(mode)) {
+        owarn << "Unable to open file " << f.name() << oendl;
+    }
 }
 
 Om3u::~Om3u(){}
 
 void Om3u::readM3u() {
 //    odebug << "<<<<<<reading m3u "+f.name() << oendl; 
     QTextStream t(&f);
                 t.setEncoding(QTextStream::UnicodeUTF8);
                 QString s;
     while ( !t.atEnd() ) {
         s=t.readLine();
 //                odebug << s << oendl; 
@@ -74,62 +77,52 @@ 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" ) {
                 s = s.right( s.length() - s.find("=",0,true)-1 );
                 s = s.stripWhiteSpace();
                 s.replace( QRegExp( "%20" )," ");
 //                odebug << "adding " + s + " to playlist" << oendl; 
-                // 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;
         QTextStream t(&f);
   t.setEncoding(QTextStream::UnicodeUTF8);
  if(count()>0) {
     for ( QStringList::ConstIterator it = begin(); it != end(); ++it ) {
 //      odebug << *it << oendl; 
                                 t << *it << "\n";
     }
   }
-//    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;
       //        odebug << *it << oendl;