Changeset 165 for smplayer/trunk/src/playlist.cpp

Timestamp:

May 16, 2014, 9:51:55 AM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to latest 0.8.7

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/playlist.cpp (modified) (10 diffs)

smplayer/trunk/src/playlist.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -40 +40 @@
 #include <QTextCodec>
 #include <QApplication>
+#include <QMimeData>
 
 #include "mytablewidget.h"
@@ -154 +155 @@
         listView->setSortingEnabled(false);
         //listView->setAlternatingRowColors(true);
+
+#if QT_VERSION >= 0x050000
+        listView->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
+        listView->horizontalHeader()->setSectionResizeMode(COL_NAME, QHeaderView::Stretch);
+#else
         listView->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
         listView->horizontalHeader()->setResizeMode(COL_NAME, QHeaderView::Stretch);
+#endif
         /*
         listView->horizontalHeader()->setResizeMode(COL_TIME, QHeaderView::ResizeToContents);
@@ -396 +403 @@
 
         if ((current_item > -1) && (current_item < pl.count())) {
-                pl[current_item].setPlayed(TRUE);
+                pl[current_item].setPlayed(true);
         }
 
@@ -472 +479 @@
                         if (filename.indexOf(QRegExp("^.*://.*")) == -1) {
                                 // Local file
-                                name = fi.fileName(); //fi.baseName(TRUE);
+                                name = fi.fileName(); //fi.baseName(true);
                         } else {
                                 // Stream
@@ -910 +917 @@
 
         if (!filename.isEmpty()) {
-                //pl[n].setPlayed(TRUE);
+                //pl[n].setPlayed(true);
                 setCurrentItem(n);
                 if (play_files_from_start) 
@@ -949 +956 @@
         } else {
                 if (pl.count() > 1) playItem( pl.count() -1 );
+        }
+}
+
+
+void Playlist::resumePlay() {
+        if (pl.count() > 0) {
+                if (current_item < 0) current_item = 0;
+                playItem(current_item);
         }
 }
@@ -1138 +1153 @@
                 if (listView->isSelected(n, 0)) {
                         qDebug(" row %d selected", n);
-                        pl[n].setMarkForDeletion(TRUE);
+                        pl[n].setMarkForDeletion(true);
                         number_previous_item++;
                         if (first_selected == -1) first_selected = n;
@@ -1184 +1199 @@
         PlaylistItemList::iterator it;
         for ( it = pl.begin(); it != pl.end(); ++it ) {
-                (*it).setPlayed(FALSE);
+                (*it).setPlayed(false);
         }
         updateView();
@@ -1329 +1344 @@
         }
 
+        #ifdef Q_OS_WIN
+        files = Helper::resolveSymlinks(files); // Check for Windows shortcuts
+        #endif
 
         QStringList only_files;