diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp index cf18b0cfd..edea1af46 100755 --- a/src/libprojectM/projectM.cpp +++ b/src/libprojectM/projectM.cpp @@ -524,6 +524,8 @@ int projectM::initPresetTools(int gx, int gy) m_activePreset = m_presetLoader->loadPreset ("idle://Geiss & Sperl - Feedback (projectM idle HDR mix).milk"); + renderer->SetPipeline(m_activePreset->pipeline()); + // Case where no valid presets exist in directory. Could also mean // playlist initialization was deferred if ( m_presetChooser->empty() ) diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt index 3a2016592..6f42bc3eb 100644 --- a/src/projectM-qt/CMakeLists.txt +++ b/src/projectM-qt/CMakeLists.txt @@ -1,7 +1,5 @@ -# the next line sets up include and link directories and defines some variables that we will use. -# you can modify the behavior by setting some variables, e.g. -project(projectM-qt) # the name of your project +project(projectM-qt) # the name of your project cmake_minimum_required(VERSION 2.4.0) include(FindPkgConfig.cmake) diff --git a/src/projectM-qt/qplaylistfiledialog.hpp b/src/projectM-qt/qplaylistfiledialog.hpp index 97ece1b5b..1e4c4b58c 100644 --- a/src/projectM-qt/qplaylistfiledialog.hpp +++ b/src/projectM-qt/qplaylistfiledialog.hpp @@ -19,8 +19,8 @@ ***************************************************************************/ -#ifndef QPLAYLIST_FILEDIALOG_H -#define QPLAYLIST_FILEDIALOG_H +#ifndef QPLAYLIST_FILEDIALOG_HPP +#define QPLAYLIST_FILEDIALOG_HPP #include #include @@ -105,7 +105,7 @@ if (filter != QString()) filter += " and "; - filter += "Preset Playlists (*.ppl)"; + filter += "Preset Playlists (*.ppl)"; } return filter; diff --git a/src/projectM-qt/qplaylistmodel.cpp b/src/projectM-qt/qplaylistmodel.cpp index 272672d71..efd94e008 100644 --- a/src/projectM-qt/qplaylistmodel.cpp +++ b/src/projectM-qt/qplaylistmodel.cpp @@ -99,8 +99,6 @@ Qt::ItemFlags QPlaylistModel::flags(const QModelIndex &index) const bool QPlaylistModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { - qDebug() << "DROP"; - if (!data->hasFormat(PRESET_MIME_TYPE)) return false; @@ -305,7 +303,7 @@ bool QPlaylistModel::readPlaylist ( const QString & file ) } foreach (QFileInfo info, QDir(file).entryInfoList()) { - if (info.fileName().toLower().endsWith(".prjm") || info.fileName().toLower().endsWith(".milk")) + if (info.fileName().toLower().endsWith(".prjm") || info.fileName().toLower().endsWith(".milk") || info.fileName().toLower().endsWith(".so")) appendRow(info.absoluteFilePath(), info.fileName(), 3); } return true; diff --git a/src/projectM-qt/qpresetfiledialog.hpp b/src/projectM-qt/qpresetfiledialog.hpp index 0c39308dd..3c90f6432 100644 --- a/src/projectM-qt/qpresetfiledialog.hpp +++ b/src/projectM-qt/qpresetfiledialog.hpp @@ -39,7 +39,7 @@ public: QPresetFileDialog(QWidget * parent = 0): - QFileDialog(parent, "Add preset files", QString(), "Presets (*.prjm *.milk)" ) { + QFileDialog(parent, "Add preset files", QString(), "Presets (*.prjm *.milk *.so)" ) { this->setFileMode(QFileDialog::ExistingFiles); } diff --git a/src/projectM-qt/qprojectmconfigdialog.cpp b/src/projectM-qt/qprojectmconfigdialog.cpp index 89504f3ed..311da6a2e 100644 --- a/src/projectM-qt/qprojectmconfigdialog.cpp +++ b/src/projectM-qt/qprojectmconfigdialog.cpp @@ -178,7 +178,5 @@ void QProjectMConfigDialog::loadConfig() { _ui.fullscreenOnStartupCheckBox->setCheckState(qSettings.value("FullscreenOnStartup", false).toBool() ? Qt::Checked : Qt::Unchecked); _ui.menuOnStartupCheckBox->setCheckState(qSettings.value("MenuOnStartup", false).toBool() ? Qt::Checked : Qt::Unchecked); _ui.startupPlaylistFileLineEdit->setText(qSettings.value("PlaylistFile", QString()).toString() ); - - qDebug() << "load config END"; - + }