Changeset 175 for smplayer/vendor/current/src/favorites.cpp

Timestamp:

May 3, 2016, 2:14:41 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update vendor to version 16.4

File:

• smplayer/vendor/current/src/favorites.cpp (modified) (4 diffs)

smplayer/vendor/current/src/favorites.cpp ¶

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -292 +292 @@
         QRegExp info2("^#EXTINF:(.*),(.*),(.*),(.*)");
 
-    QFile f( _filename );
-    if ( f.open( QIODevice::ReadOnly ) ) {
+        QFile f( _filename );
+        if ( f.open( QIODevice::ReadOnly ) ) {
 
                 f_list.clear();
@@ -299 +299 @@
                 Favorite fav;
 
-        QTextStream stream( &f );
+                QTextStream stream( &f );
                 stream.setCodec("UTF-8");
 
-        QString line;
-        while ( !stream.atEnd() ) {
-            line = stream.readLine(); // line of text excluding '\n'
+                QString line;
+                while ( !stream.atEnd() ) {
+                        line = stream.readLine().trimmed();
+                        if (line.isEmpty()) continue; // Ignore empty lines
                         //qDebug("info2.indexIn: %d", info2.indexIn(line));
                         //qDebug("info1.indexIn: %d", info1.indexIn(line));
-            //qDebug( " * line: '%s'", line.toUtf8().data() );
+                        //qDebug( " * line: '%s'", line.toUtf8().data() );
                         if (m3u_id.indexIn(line)!=-1) {
                                 //#EXTM3U
@@ -341 +342 @@
                                 fav.setSubentry(false);
                         }
-        }
-        f.close();
+                }
+                f.close();
         }
 }