diff options
Diffstat (limited to 'src/qmmpui')
| -rw-r--r-- | src/qmmpui/commandlinehandler.h | 2 | ||||
| -rw-r--r-- | src/qmmpui/fileloader.cpp | 8 | ||||
| -rw-r--r-- | src/qmmpui/playlistparser.h | 5 | ||||
| -rw-r--r-- | src/qmmpui/playlisttask.cpp | 4 | ||||
| -rw-r--r-- | src/qmmpui/uihelper.h | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/src/qmmpui/commandlinehandler.h b/src/qmmpui/commandlinehandler.h index 300ad00c7..2787c0513 100644 --- a/src/qmmpui/commandlinehandler.h +++ b/src/qmmpui/commandlinehandler.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2019 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index ecd92dc19..761569bf9 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2019 by Ilya Kotov * + * Copyright (C) 2006-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -35,7 +35,7 @@ FileLoader::FileLoader(QObject *parent) : QThread(parent) m_settings = QmmpUiSettings::instance(); m_finished = false; m_readMetaDataForPlayLists = true; - m_parts = TrackInfo::NoParts; + m_parts = TrackInfo::Parts(); connect(qApp, SIGNAL(aboutToQuit()), SLOT(finish())); } @@ -305,7 +305,7 @@ void FileLoader::addPlayList(const QString &fmt, const QByteArray &data) MetaDataManager::instance()->prepareForAnotherThread(); PlayListParser::loadFormats(); m_filters = MetaDataManager::instance()->nameFilters(); - m_parts = m_settings->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts; + m_parts = m_settings->useMetaData() ? TrackInfo::AllParts : TrackInfo::Parts(); m_readMetaDataForPlayLists = m_settings->readMetaDataForPlayLists(); } start(QThread::IdlePriority); @@ -332,7 +332,7 @@ void FileLoader::insert(PlayListItem *before, const QStringList &paths) { MetaDataManager::instance()->prepareForAnotherThread(); m_filters = MetaDataManager::instance()->nameFilters(); - m_parts = m_settings->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts; + m_parts = m_settings->useMetaData() ? TrackInfo::AllParts : TrackInfo::Parts(); m_readMetaDataForPlayLists = m_settings->readMetaDataForPlayLists(); } start(QThread::IdlePriority); diff --git a/src/qmmpui/playlistparser.h b/src/qmmpui/playlistparser.h index 64cb4cbbf..88ba6b95d 100644 --- a/src/qmmpui/playlistparser.h +++ b/src/qmmpui/playlistparser.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2019 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -40,6 +40,9 @@ public: * Returns a list of the supported files name filters, i.e. "*.m3u *.pls" */ static QStringList nameFilters(); + /*! + * Returns a list of file name filters with description, i.e. "M3U (*.m3u)" + */ static QStringList filters(); /*! * Returns \b true if file \b url is playlist. Otherwise returns \b false. diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index 37b543b85..9933476a7 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2014-2019 by Ilya Kotov * + * Copyright (C) 2014-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -465,7 +465,7 @@ void PlayListTask::run() //create new playlist tracks QStringList ignoredFiles; - TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetaData() ? TrackInfo::AllParts : TrackInfo::NoParts; + TrackInfo::Parts parts = QmmpUiSettings::instance()->useMetaData() ? TrackInfo::AllParts : TrackInfo::Parts(); for(const QFileInfo &f : qAsConst(l)) { QStringList ignored; diff --git a/src/qmmpui/uihelper.h b/src/qmmpui/uihelper.h index 2367b62f4..1b1f76f69 100644 --- a/src/qmmpui/uihelper.h +++ b/src/qmmpui/uihelper.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2019 by Ilya Kotov * + * Copyright (C) 2008-2020 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -86,6 +86,7 @@ public: * Creates menu with type \b type * @param type Menu type. * @param title Menu title. + * @param autoHide Hide empty menu. * @param parent Parent widget */ QMenu *createMenu(MenuType type, const QString &title = QString(), bool autoHide = true, QWidget *parent = nullptr); @@ -93,6 +94,7 @@ public: * Registers existing menu for access from general plugins. * @param type Menu type. * @param menu Menu pointer. + * @param autoHide Hide empty menu. * @param before An action, after which the rest are added. */ void registerMenu(MenuType type, QMenu *menu, bool autoHide = false, QAction *before = nullptr); |