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

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

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

smplayer/trunk/src/playlist.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -45 +45 @@
 #include <QMimeData>
 #include <QDomDocument>
+#include <QDesktopServices>
 #include <QDebug>
 
@@ -61 +62 @@
 #include "extensions.h"
 #include "guiconfig.h"
+
+#ifdef CHROMECAST_SUPPORT
+#include "chromecast.h"
+#endif
 
 #ifdef PLAYLIST_DOWNLOAD
@@ -224 +229 @@
 }
 
+void PLItem::setExtraParams(const QStringList & pars) {
+        setData(pars, Role_Params);
+}
+
+QStringList PLItem::extraParams() {
+        return data(Role_Params).toStringList();
+}
+
+void PLItem::setVideoURL(const QString & url) {
+        setData(url, Role_Video_URL);
+}
+
+QString PLItem::videoURL() {
+        return data(Role_Video_URL).toString();
+}
 
 /* ----------------------------------------------------------- */
@@ -237 +257 @@
         , play_files_from_start(true)
         , row_spacing(-1) // Default height
+        , start_play_on_load(true)
         , automatically_play_next(true)
         , ignore_player_errors(false)
@@ -245 +266 @@
         latest_dir = "";
 
+        filter_edit = new MyLineEdit(this);
+        connect(filter_edit, SIGNAL(textChanged(const QString &)), this, SLOT(filterEditChanged(const QString &)));
+
         createTable();
         createActions();
@@ -250 +274 @@
 
         QVBoxLayout *layout = new QVBoxLayout;
+#ifdef PLAYLIST_DOUBLE_TOOLBAR
+        layout->addWidget(toolbar);
+        layout->addWidget(listView);
+        layout->addWidget(toolbar2);
+#else
         layout->addWidget(listView);
         layout->addWidget(toolbar);
-#ifdef PLAYLIST_DOUBLE_TOOLBAR
-        layout->addWidget(toolbar2);
+        layout->addWidget(filter_edit);
+        filter_edit->hide();
 #endif
         setLayout(layout);
@@ -291 +320 @@
 
         history_urls = new URLHistory;
-        history_urls->addUrl("http://smplayer.info/onlinetv.php");
+        history_urls->addUrl("http://smplayer.info/sample.m3u8");
 #endif
 }
@@ -320 +349 @@
 }
 
+void Playlist::updateWindowTitle() {
+        QString title;
+
+        title = playlist_filename;
+        if (title.isEmpty()) title = tr("Untitled playlist");
+        if (modified) title += " (*)";
+
+        qDebug() << "Playlist::updateWindowTitle:" << title;
+
+        setWindowTitle(title);
+        emit windowTitleChanged(title);
+}
+
+void Playlist::setPlaylistFilename(const QString & f) {
+        playlist_filename = f;
+        updateWindowTitle();
+}
 
 void Playlist::setModified(bool mod) {
@@ -326 +372 @@
         modified = mod;
         emit modifiedChanged(modified);
+        updateWindowTitle();
 }
 
@@ -358 +405 @@
         listView->setShowGrid(false);
         listView->setSortingEnabled(true);
+        listView->setWordWrap(false);
 #if !USE_ITEM_DELEGATE
         listView->setAlternatingRowColors(true);
@@ -376 +424 @@
 #endif
         listView->horizontalHeader()->setStretchLastSection(true);
+        listView->horizontalHeader()->setSortIndicator(0, Qt::AscendingOrder);
 
         /*
@@ -393 +442 @@
         connect(listView, SIGNAL(activated(const QModelIndex &)),
             this, SLOT(itemActivated(const QModelIndex &)) );
+
+        setFilenameColumnVisible(false);
 }
 
@@ -405 +456 @@
 
         saveAct = new MyAction(this, "pl_save", false);
-        connect( saveAct, SIGNAL(triggered()), this, SLOT(save()) );
+        connect( saveAct, SIGNAL(triggered()), this, SLOT(saveCurrentPlaylist()) );
+
+        saveAsAct = new MyAction(this, "pl_save_as", false);
+        connect( saveAsAct, SIGNAL(triggered()), this, SLOT(save()) );
 
         playAct = new MyAction(this, "pl_play", false);
@@ -452 +506 @@
         connect( editAct, SIGNAL(triggered()), this, SLOT(editCurrentItem()) );
 
+#ifdef PLAYLIST_DELETE_FROM_DISK
         deleteSelectedFileFromDiskAct = new MyAction(this, "pl_delete_from_disk");
         connect( deleteSelectedFileFromDiskAct, SIGNAL(triggered()), this, SLOT(deleteSelectedFileFromDisk()));
+#endif
+
+        copyURLAct = new MyAction(this, "pl_copy_url");
+        connect( copyURLAct, SIGNAL(triggered()), this, SLOT(copyURL()));
+
+        openFolderAct = new MyAction(this, "pl_open_folder");
+        connect( openFolderAct, SIGNAL(triggered()), this, SLOT(openFolder()));
+
+#ifdef CHROMECAST_SUPPORT
+        playOnChromecastAct = new MyAction(this, "pl_chromecast");
+        connect( playOnChromecastAct, SIGNAL(triggered()), this, SLOT(playOnChromecast()));
+#else
+        openURLInWebAct = new MyAction(this, "pl_url_in_web");
+        connect( openURLInWebAct, SIGNAL(triggered()), this, SLOT(openURLInWeb()));
+#endif
+
+        showSearchAct = new MyAction(this, "pl_show_search", false);
+        showSearchAct->setCheckable(true);
+        connect(showSearchAct, SIGNAL(toggled(bool)), filter_edit, SLOT(setVisible(bool)));
+
+        showPositionColumnAct = new MyAction(this, "pl_show_position_column");
+        showPositionColumnAct->setCheckable(true);
+        connect(showPositionColumnAct, SIGNAL(toggled(bool)), this, SLOT(setPositionColumnVisible(bool)));
+
+        showNameColumnAct = new MyAction(this, "pl_show_name_column");
+        showNameColumnAct->setCheckable(true);
+        connect(showNameColumnAct, SIGNAL(toggled(bool)), this, SLOT(setNameColumnVisible(bool)));
+
+        showDurationColumnAct = new MyAction(this, "pl_show_duration_column");
+        showDurationColumnAct->setCheckable(true);
+        connect(showDurationColumnAct, SIGNAL(toggled(bool)), this, SLOT(setDurationColumnVisible(bool)));
+
+        showFilenameColumnAct = new MyAction(this, "pl_show_filename_column");
+        showFilenameColumnAct->setCheckable(true);
+        connect(showFilenameColumnAct, SIGNAL(toggled(bool)), this, SLOT(setFilenameColumnVisible(bool)));
 }
 
@@ -466 +556 @@
 #endif
 
+/*
         toolbar->addAction(openAct);
 #ifdef PLAYLIST_DOWNLOAD
@@ -472 +563 @@
         toolbar->addAction(saveAct);;
         toolbar->addSeparator();
+*/
+
+        file_menu = new QMenu(this);
+        file_menu->addAction(openAct);
+        file_menu->addAction(saveAct);
+        file_menu->addAction(saveAsAct);
+#ifdef PLAYLIST_DOWNLOAD
+        file_menu->addAction(openUrlAct);
+#endif
+
+        file_button = new QToolButton(this);
+        file_button->setMenu(file_menu);
+        file_button->setPopupMode(QToolButton::InstantPopup);
 
         add_menu = new QMenu( this );
@@ -491 +595 @@
         remove_button->setPopupMode(QToolButton::InstantPopup);
 
-        filter_edit = new MyLineEdit(this);
-        connect(filter_edit, SIGNAL(textChanged(const QString &)), this, SLOT(filterEditChanged(const QString &)));
 
 #ifdef PLAYLIST_DOWNLOAD
@@ -501 +603 @@
 #endif
 
+        toolbar->addWidget(file_button);
+        toolbar->addSeparator();
         toolbar->addWidget(add_button);
         toolbar->addWidget(remove_button);
@@ -526 +630 @@
         toolbar->addAction(moveDownAct);
         toolbar->addSeparator();
-        toolbar->addWidget(filter_edit);
+        toolbar->addAction(showSearchAct);
+        // toolbar->addWidget(filter_edit);
         #ifdef PLAYLIST_DOWNLOAD
         loading_label_action = toolbar->addWidget(loading_label);
@@ -541 +646 @@
         popup->addAction(removeSelectedAct);
         popup->addAction(editAct);
+#ifdef PLAYLIST_DELETE_FROM_DISK
         popup->addAction(deleteSelectedFileFromDiskAct);
+#endif
+        popup->addAction(copyURLAct);
+        popup->addAction(openFolderAct);
+#ifdef CHROMECAST_SUPPORT
+        popup->addAction(playOnChromecastAct);
+#else
+        popup->addAction(openURLInWebAct);
+#endif
+        popup->addSeparator();
+        popup->addAction(showPositionColumnAct);
+        popup->addAction(showNameColumnAct);
+        popup->addAction(showDurationColumnAct);
+        popup->addAction(showFilenameColumnAct);
 
         connect( listView, SIGNAL(customContextMenuRequested(const QPoint &)),
@@ -550 +669 @@
         table->setHorizontalHeaderLabels(QStringList() << " " << tr("Name") << tr("Length") << tr("Filename / URL") );
 
-        openAct->change( Images::icon("open"), tr("&Load") );
+        openAct->change( Images::icon("open"), tr("&Load...") );
 #ifdef PLAYLIST_DOWNLOAD
-        openUrlAct->change( Images::icon("url"), tr("&Open URL") );
+        openUrlAct->change( Images::icon("url"), tr("Load playlist from &URL...") );
         openUrlAct->setToolTip(tr("Download playlist from URL"));
 #endif
         saveAct->change( Images::icon("save"), tr("&Save") );
+        saveAsAct->change( Images::icon("save"), tr("Save &as...") );
 
         playAct->change( tr("&Play") );
@@ -579 +699 @@
 
         // Remove actions
-        removeSelectedAct->change( tr("Remove &selected") );
+        removeSelectedAct->change( Images::icon("delete"), tr("Remove &selected") );
         removeAllAct->change( tr("Remove &all") );
 
+#ifdef PLAYLIST_DELETE_FROM_DISK
         deleteSelectedFileFromDiskAct->change( tr("&Delete file from disk") );
+#endif
+
+        copyURLAct->change( Images::icon("copy"), tr("&Copy file path to clipboard") );
+        openFolderAct->change( Images::icon("openfolder"), tr("&Open source folder") );
+
+#ifdef CHROMECAST_SUPPORT
+        playOnChromecastAct->change( Images::icon("chromecast"), tr("Play on Chromec&ast") );
+#else
+        openURLInWebAct->change( tr("Open stream in &a web browser") );
+#endif
+
+        showSearchAct->change(Images::icon("find"), tr("Search"));
+
+        showPositionColumnAct->change(tr("Show position column"));
+        showNameColumnAct->change(tr("Show name column"));
+        showDurationColumnAct->change(tr("Show length column"));
+        showFilenameColumnAct->change(tr("Show filename column"));
 
         // Edit
@@ -588 +726 @@
 
         // Tool buttons
+        file_button->setIcon(Images::icon("open")); // FIXME: change icon
+        file_button->setToolTip(tr("Load/Save"));
         add_button->setIcon( Images::icon("plus") );
         add_button->setToolTip( tr("Add...") );
@@ -600 +740 @@
         // Icon
         setWindowIcon( Images::icon("logo", 64) );
-        setWindowTitle( tr( "SMPlayer - Playlist" ) );
+        //setWindowTitle( tr( "SMPlayer - Playlist" ) );
 }
 
@@ -619 +759 @@
         qDebug() << "Playlist::filterEditChanged:" << text;
         setFilter(text);
+
+        if (text.isEmpty()) {
+                qApp->processEvents();
+                listView->scrollTo(listView->currentIndex(), QAbstractItemView::PositionAtCenter);
+        }
 }
 
@@ -675 +820 @@
 
 bool Playlist::isEmpty() {
-        return (table->rowCount() > 0);
+        return (table->rowCount() == 0);
 }
 
@@ -713 +858 @@
 */
 
-void Playlist::addItem(QString filename, QString name, double duration) {
+void Playlist::addItem(QString filename, QString name, double duration, QStringList params, QString video_url) {
         //qDebug() << "Playlist::addItem:" << filename;
 
@@ -733 +878 @@
 
         PLItem * i = new PLItem(filename, name, duration);
+        i->setExtraParams(params);
+        i->setVideoURL(video_url);
         i->setPosition(count()+1);
         table->appendRow(i->items());
@@ -802 +949 @@
                 QString name="";
                 double duration=0;
+                QStringList extra_params;
 
                 QTextStream stream( &f );
@@ -833 +981 @@
                                 if (fields.count() >= 1) duration = fields[0].toDouble();
                                 if (fields.count() >= 2) name = fields[1];
+                        }
+                        else
+                        if (line.startsWith("#EXTVLCOPT:")) {
+                                QString par = line.mid(11);
+                                qDebug() << "Playlist::load_m3u: EXTVLCOPT:" << par;
+                                extra_params << par;
                         }
                         else
@@ -849 +1003 @@
                                         }
                                 }
-                                addItem( filename, name, duration );
+                                name.replace("&#44;", ",");
+                                //qDebug() << "Playlist::load_m3u: extra_params:" << extra_params;
+                                addItem( filename, name, duration, extra_params );
                                 name=""; 
                                 duration = 0;
+                                extra_params.clear();
                         }
                 }
@@ -857 +1014 @@
                 //list();
 
+                setPlaylistFilename(file);
                 setModified( false );
 
-                startPlay();
+                if (start_play_on_load) startPlay();
         }
 }
@@ -906 +1064 @@
         //list();
 
+        setPlaylistFilename(file);
         setModified( false );
 
-        if (set.status() == QSettings::NoError) startPlay();
+        if (set.status() == QSettings::NoError && start_play_on_load) startPlay();
 }
 
@@ -948 +1107 @@
 
                 //list();
+                setPlaylistFilename(filename);
                 setModified( false );
-                startPlay();
+                if (start_play_on_load) startPlay();
         }
 }
@@ -977 +1137 @@
 
                 QString filename;
+                QString name;
 
                 stream << "#EXTM3U" << "\n";
@@ -987 +1148 @@
                         filename = Helper::changeSlashes(filename);
                         #endif
+                        name = i->name();
+                        name.replace(",", "&#44;");
                         stream << "#EXTINF:";
                         stream << i->duration() << ",";
-                        stream << i->name() << "\n";
+                        stream << name << "\n";
+
+                        // Save extra params
+                        QStringList params = i->extraParams();
+                        foreach(QString par, params) {
+                                stream << "#EXTVLCOPT:" << par << "\n";
+                        }
+
                         // Try to save the filename as relative instead of absolute
                         if (filename.startsWith( dir_path )) {
@@ -998 +1168 @@
                 f.close();
 
+                setPlaylistFilename(file);
                 setModified( false );
                 return true;
@@ -1048 +1219 @@
 
         bool ok = (set.status() == QSettings::NoError);
-        if (ok) setModified( false );
+        if (ok) {
+                setPlaylistFilename(file);
+                setModified( false );
+        }
 
         return ok;
@@ -1112 +1286 @@
                 stream << "</playlist>\n";
 
+                setPlaylistFilename(filename);
                 setModified(false);
                 return true;
@@ -1147 +1322 @@
 }
 
-bool Playlist::save() {
-        Extensions e;
-        QString s = MyFileDialog::getSaveFileName(
+bool Playlist::saveCurrentPlaylist() {
+        qDebug("Playlist::saveCurrentPlaylist");
+        return save(playlistFilename());
+}
+
+bool Playlist::save(const QString & filename) {
+        qDebug() << "Playlist::save:" << filename;
+
+        QString s = filename;
+
+        if (s.isEmpty()) {
+                Extensions e;
+                s = MyFileDialog::getSaveFileName(
                     this, tr("Choose a filename"), 
                     lastDir(),
                     tr("Playlists") + e.playlist().forFilter() + ";;" + tr("All files") +" (*)");
+        }
 
         if (!s.isEmpty()) {
@@ -1222 +1408 @@
         qDebug("Playlist::showPopup: x: %d y: %d", pos.x(), pos.y() );
 
+        QModelIndex index = listView->currentIndex();
+        if (!index.isValid()) {
+                playAct->setEnabled(false);
+                removeSelectedAct->setEnabled(false);
+                editAct->setEnabled(false);
+                #ifdef PLAYLIST_DELETE_FROM_DISK
+                deleteSelectedFileFromDiskAct->setEnabled(false);
+                #endif
+                copyURLAct->setEnabled(false);
+                openFolderAct->setEnabled(false);
+                #ifdef CHROMECAST_SUPPORT
+                playOnChromecastAct->setEnabled(false);
+                #else
+                openURLInWebAct->setEnabled(false);
+                #endif
+        } else {
+                playAct->setEnabled(true);
+                removeSelectedAct->setEnabled(true);
+                editAct->setEnabled(true);
+                #ifdef PLAYLIST_DELETE_FROM_DISK
+                deleteSelectedFileFromDiskAct->setEnabled(true);
+                #endif
+                copyURLAct->setEnabled(true);
+                openFolderAct->setEnabled(true);
+                #ifdef CHROMECAST_SUPPORT
+                playOnChromecastAct->setEnabled(true);
+                #else
+                openURLInWebAct->setEnabled(true);
+                #endif
+
+                QModelIndex s_index = proxy->mapToSource(index);
+                int current = s_index.row();
+                PLItem * i = itemData(current);
+                QString filename = i->filename();
+                QFileInfo fi(filename);
+
+                if (fi.exists()) {
+                        copyURLAct->setText( tr("&Copy file path to clipboard") );
+                        #ifndef CHROMECAST_SUPPORT
+                        openURLInWebAct->setEnabled(false);
+                        #endif
+                } else {
+                        copyURLAct->setText( tr("&Copy URL to clipboard") );
+                        openFolderAct->setEnabled(false);
+                }
+        }
+
         if (!popup->isVisible()) {
                 popup->move( listView->viewport()->mapToGlobal(pos) );
@@ -1245 +1478 @@
         }
 
-        QString filename = itemFromProxy(n)->filename();
+        PLItem * i = itemFromProxy(n);
+        QString filename = i->filename();
+        QStringList params = i->extraParams();
+
         if (!filename.isEmpty()) {
                 setCurrentItem(n);
-                if (play_files_from_start) {
-                        emit requestToPlayFile(filename, 0);
+
+                if (!params.isEmpty()) {
+                        emit requestToPlayStream(filename, params);
                 } else {
-                        emit requestToPlayFile(filename);
+                        if (play_files_from_start) {
+                                emit requestToPlayFile(filename, 0);
+                        } else {
+                                emit requestToPlayFile(filename);
+                        }
                 }
         }
@@ -1294 +1535 @@
 }
 
+void Playlist::playNextAuto() {
+        qDebug("Playlist::playNextAuto");
+        if (automatically_play_next) {
+                playNext();
+        } else {
+                emit playlistEnded();
+        }
+}
 
 void Playlist::resumePlay() {
@@ -1311 +1560 @@
         double duration = mdat.duration;
         QString artist = mdat.clip_artist;
+        QString video_url = mdat.stream_path;
 
         #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
@@ -1350 +1600 @@
                                 i->setDuration(duration);
                         }
+                        i->setVideoURL(video_url);
                 }
         }
@@ -1368 +1619 @@
                             tr("All files") +" (*.*)" );
 
-        if (files.count()!=0) addFiles(files);  
+        if (files.count() != 0) {
+                addFiles(files);
+                setModified(true);
+        }
 }
 
@@ -1446 +1700 @@
                         if (!u.isEmpty()) addItem( u, "", 0 );
                 }
+                setModified(true);
         }
 }
@@ -1487 +1742 @@
                 }
         }
+        setModified(true);
 }
 
@@ -1513 +1769 @@
 void Playlist::removeAll() {
         clear();
+        setPlaylistFilename("");
 }
 
@@ -1568 +1825 @@
                 table->insertRow(s_prev.row(), cells);
                 listView->selectionModel()->setCurrentIndex(listView->model()->index(index.row()-1, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+
+                setModified(true);
         }
 }
@@ -1598 +1857 @@
                 table->insertRow(s_next.row(), cells);
                 listView->selectionModel()->setCurrentIndex(listView->model()->index(index.row()+1, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
+
+                setModified(true);
         }
 }
@@ -1622 +1883 @@
             QLineEdit::Normal,
             current_name, &ok );
-    if ( ok && !text.isEmpty() ) {
+        if ( ok && !text.isEmpty() ) {
                 // user entered something and pressed OK
                 i->setName(text);
@@ -1633 +1894 @@
 }
 
+#ifdef PLAYLIST_DELETE_FROM_DISK
 void Playlist::deleteSelectedFileFromDisk() {
         qDebug("Playlist::deleteSelectedFileFromDisk");
@@ -1683 +1945 @@
         }
 }
+#endif
+
+void Playlist::copyURL() {
+        qDebug("Playlist::copyURL");
+
+        QModelIndexList indexes = listView->selectionModel()->selectedRows();
+        int count = indexes.count();
+
+        QString text;
+
+        for (int n = 0; n < count; n++) {
+                QModelIndex s_index = proxy->mapToSource(indexes.at(n));
+                int current = s_index.row();
+                text += itemData(current)->filename();
+                if (n < count-1) {
+                        #ifdef Q_OS_WIN
+                        text += "\r\n";
+                        #else
+                        text += "\n";
+                        #endif
+                }
+        }
+
+        if (!text.isEmpty()) QApplication::clipboard()->setText(text);
+}
+
+void Playlist::openFolder() {
+        qDebug("Playlist::openFolder");
+
+        QModelIndex index = listView->currentIndex();
+        if (!index.isValid()) return;
+        QModelIndex s_index = proxy->mapToSource(index);
+        int current = s_index.row();
+        PLItem * i = itemData(current);
+        QString filename = i->filename();
+
+        qDebug() << "Playlist::openFolder: filename:" << filename;
+
+        QFileInfo fi(filename);
+        if (fi.exists()) {
+                QString src_folder = fi.absolutePath();
+                QDesktopServices::openUrl(QUrl::fromLocalFile(src_folder));
+        }
+}
+
+#ifdef CHROMECAST_SUPPORT
+void Playlist::playOnChromecast() {
+        qDebug("Playlist::playOnChromecast");
+
+        QModelIndex index = listView->currentIndex();
+        if (!index.isValid()) return;
+        QModelIndex s_index = proxy->mapToSource(index);
+        int current = s_index.row();
+        PLItem * i = itemData(current);
+        QString filename = i->filename();
+        QString video_url = i->videoURL();
+
+        QString url = filename;
+        if (!video_url.isEmpty()) url = video_url;
+
+        if (QFile::exists(filename)) {
+                Chromecast::instance()->openLocal(url, i->name());
+        } else {
+                Chromecast::instance()->openStream(url, i->name());
+        }
+}
+#else
+void Playlist::openURLInWeb() {
+        qDebug("Playlist::openURLInWeb");
+
+        QModelIndex index = listView->currentIndex();
+        if (!index.isValid()) return;
+        QModelIndex s_index = proxy->mapToSource(index);
+        int current = s_index.row();
+        PLItem * i = itemData(current);
+        QString filename = i->filename();
+        QString video_url = i->videoURL();
+
+        QString url = filename;
+        if (!video_url.isEmpty()) url = video_url;
+
+        QDesktopServices::openUrl(QUrl(url));
+}
+#endif
 
 // Drag&drop
@@ -1731 +2077 @@
                 }
         }
+
+        if (only_files.count() == 1) {
+                // Check if the file is a playlist
+                QString filename = only_files[0];
+                QFileInfo fi(filename);
+                QString extension = fi.suffix().toLower();
+                if (extension == "m3u8" || extension == "m3u") { load_m3u(filename); return; }
+                else
+                if (extension == "pls") { load_pls(filename); return; }
+                else
+                if (extension == "xspf") { loadXSPF(filename); return; }
+        }
+
         addFiles( only_files );
+        setModified(true);
 }
 
@@ -1783 +2143 @@
         set->setValue( "save_playlist_in_config", save_playlist_in_config );
         set->setValue( "play_files_from_start", play_files_from_start );
+        set->setValue( "start_play_on_load", start_play_on_load );
         set->setValue( "automatically_play_next", automatically_play_next );
         set->setValue( "ignore_player_errors", ignore_player_errors );
@@ -1792 +2153 @@
         set->setValue( "size", size() );
 #endif
-        set->setValue(QString("header_state/%1").arg(Helper::qtVersion()), listView->horizontalHeader()->saveState());
+
+        set->setValue(QString("header_state/2/%1").arg(Helper::qtVersion()), listView->horizontalHeader()->saveState());
 
         set->setValue( "sort_column", proxy->sortColumn() );
         set->setValue( "sort_order", proxy->sortOrder() );
-        set->setValue( "filter_case_sensivity", proxy->filterCaseSensitivity() );
+        set->setValue( "filter_case_sensitive", filterCaseSensitive() );
         set->setValue( "filter", filter_edit->text() );
-        set->setValue( "sort_case_sensivity", proxy->sortCaseSensitivity() );
+        set->setValue( "sort_case_sensitive", sortCaseSensitive() );
+        set->setValue( "auto_sort", autoSort() );
+
+        set->setValue( "show_search", showSearchAct->isChecked() );
 
         set->endGroup();
@@ -1818 +2183 @@
                         set->setValue( QString("item_%1_duration").arg(n), i->duration() );
                         set->setValue( QString("item_%1_name").arg(n), i->name() );
+                        set->setValue( QString("item_%1_params").arg(n), i->extraParams() );
+                        set->setValue( QString("item_%1_video_url").arg(n), i->videoURL() );
                 }
                 set->endArray();
                 set->setValue( "current_item", findCurrentItem() );
+                set->setValue("filename", playlistFilename());
                 set->setValue( "modified", modified );
 
@@ -1834 +2202 @@
 
         if (set->contains("playlist/change_title")) set->remove("playlist/change_title");
+        if (set->contains("playlist/sort_case_sensivity")) set->remove("playlist/sort_case_sensivity");
+        if (set->contains("playlist/filter_case_sensivity")) set->remove("playlist/filter_case_sensivity");
 }
 
@@ -1850 +2220 @@
         save_playlist_in_config = set->value( "save_playlist_in_config", save_playlist_in_config ).toBool();
         play_files_from_start = set->value( "play_files_from_start", play_files_from_start ).toBool();
+        start_play_on_load = set->value( "start_play_on_load", start_play_on_load ).toBool();
         automatically_play_next = set->value( "automatically_play_next", automatically_play_next ).toBool();
         ignore_player_errors = set->value( "ignore_player_errors", ignore_player_errors ).toBool();
@@ -1859 +2230 @@
         resize( set->value("size", size()).toSize() );
 #endif
-        listView->horizontalHeader()->restoreState(set->value(QString("header_state/%1").arg(Helper::qtVersion()), QByteArray()).toByteArray());
+
+        listView->horizontalHeader()->restoreState(set->value(QString("header_state/2/%1").arg(Helper::qtVersion()), QByteArray()).toByteArray());
 
         int sort_column = set->value("sort_column", COL_NUM).toInt();
         int sort_order = set->value("sort_order", Qt::AscendingOrder).toInt();
-        int filter_case_sensivity = set->value("filter_case_sensivity", Qt::CaseInsensitive).toInt();
+        bool filter_case_sensitive = set->value("filter_case_sensitive", false).toBool();
         QString filter = set->value( "filter").toString();
-        int sort_case_sensivity = set->value("sort_case_sensivity", Qt::CaseInsensitive).toInt();
+        bool sort_case_sensitive = set->value("sort_case_sensitive", false).toBool();
+        bool auto_sort = set->value("auto_sort", false).toBool();
+
+        showSearchAct->setChecked( set->value( "show_search", false).toBool() );
 
         set->endGroup();
@@ -1888 +2263 @@
                         duration = set->value( QString("item_%1_duration").arg(n), -1 ).toDouble();
                         name = set->value( QString("item_%1_name").arg(n), "" ).toString();
-                        addItem( filename, name, duration );
+                        QStringList params = set->value( QString("item_%1_params").arg(n), QStringList()).toStringList();
+                        QString video_url = set->value( QString("item_%1_video_url").arg(n), "").toString();
+                        addItem( filename, name, duration, params, video_url );
                 }
                 set->endArray();
                 setCurrentItem( set->value( "current_item", -1 ).toInt() );
+                setPlaylistFilename( set->value("filename", "").toString() );
                 setModified( set->value( "modified", false ).toBool() );
 
@@ -1905 +2283 @@
 #endif
 
-        proxy->setFilterCaseSensitivity( (Qt::CaseSensitivity) filter_case_sensivity);
-        proxy->setSortCaseSensitivity( (Qt::CaseSensitivity) sort_case_sensivity);
+        setFilterCaseSensitive(filter_case_sensitive);
+        setSortCaseSensitive(sort_case_sensitive);
         proxy->sort(sort_column, (Qt::SortOrder) sort_order);
         filter_edit->setText(filter);
+        setAutoSort(auto_sort);
+
+        if (!listView->isColumnHidden(COL_NUM)) showPositionColumnAct->setChecked(true);
+        if (!listView->isColumnHidden(COL_NAME)) showNameColumnAct->setChecked(true);
+        if (!listView->isColumnHidden(COL_TIME)) showDurationColumnAct->setChecked(true);
+        if (!listView->isColumnHidden(COL_FILENAME)) showFilenameColumnAct->setChecked(true);
 }
 
@@ -1914 +2298 @@
         QString last_dir = latest_dir;
         return last_dir;
+}
+
+void Playlist::setPositionColumnVisible(bool b) {
+        listView->setColumnHidden(COL_NUM, !b);
+}
+
+void Playlist::setNameColumnVisible(bool b) {
+        listView->setColumnHidden(COL_NAME, !b);
+}
+
+void Playlist::setDurationColumnVisible(bool b) {
+        listView->setColumnHidden(COL_TIME, !b);
+}
+
+void Playlist::setFilenameColumnVisible(bool b) {
+        listView->setColumnHidden(COL_FILENAME, !b);
+}
+
+void Playlist::setAutoSort(bool b) {
+        proxy->setDynamicSortFilter(b);
+}
+
+bool Playlist::autoSort() {
+        return proxy->dynamicSortFilter();
+}
+
+void Playlist::setSortCaseSensitive(bool b) {
+        Qt::CaseSensitivity c = b ? Qt::CaseSensitive : Qt::CaseInsensitive;
+        proxy->setSortCaseSensitivity(c);
+}
+
+bool Playlist::sortCaseSensitive() {
+        return (proxy->sortCaseSensitivity() == Qt::CaseSensitive);
+}
+
+void Playlist::setFilterCaseSensitive(bool b) {
+        Qt::CaseSensitivity c = b ? Qt::CaseSensitive : Qt::CaseInsensitive;
+        proxy->setFilterCaseSensitivity(c);
+}
+
+bool Playlist::filterCaseSensitive() {
+        return (proxy->filterCaseSensitivity() == Qt::CaseSensitive);
 }
 
@@ -1960 +2386 @@
         if (data.contains("#EXTM3U")) {
                 load_m3u(tfile, M3U8);
+                setPlaylistFilename("");
         }
         else
         if (data.contains("[playlist]")) {
                 load_pls(tfile);
+                setPlaylistFilename("");
         }
         else
         if (data.contains("xspf.org")) {
                 loadXSPF(tfile);
+                setPlaylistFilename("");
         }
         else {