mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-01 21:16:01 +00:00
Code Issues Projects Releases Wiki Activity

handle presetSwitchFailedEvent in projectM-qt (then android later)

Browse Source
This commit is contained in:
carm
2012-11-14 11:13:54 -05:00
parent 04b7336e40
commit 3e3624ef2b
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/projectM-qt/qprojectm.hpp
View File

@ -36,7 +36,7 @@ class QProjectM : public QObject, public projectM {
}
void presetSwitchFailedEvent(bool hardCut, unsigned int index, const std::string & message) const {
presetSwitchFailedSignal(hardCut, index, message);
presetSwitchFailedSignal(hardCut, index, QString(message.c_str()));
}
void presetRatingChanged(unsigned int index, int rating,
@ -46,7 +46,7 @@ class QProjectM : public QObject, public projectM {
signals:
void presetSwitchedSignal(bool hardCut, unsigned int index) const;
void presetSwitchFailedSignal(bool hardCut, unsigned int index, const std::string & message) const;
void presetSwitchFailedSignal(bool hardCut, unsigned int index, const QString & message) const;
void presetRatingChangedSignal(unsigned int index, int rating,
PresetRatingType ratingType) const;

13
src/projectM-qt/qprojectm_mainwindow.cpp
View File

@ -310,6 +310,9 @@ void QProjectM_MainWindow::postProjectM_Initialize()
connect ( m_QProjectMWidget->qprojectM(), SIGNAL ( presetSwitchedSignal ( bool,unsigned int ) ),
this, SLOT ( updatePlaylistSelection ( bool,unsigned int ) ) );
connect ( m_QProjectMWidget->qprojectM(), SIGNAL ( presetSwitchFailedSignal ( bool,unsigned int, const QString & ) ),
this, SLOT ( handleFailedPresetSwitch( bool,unsigned int, const QString &) ) );
connect ( m_QProjectMWidget->qprojectM(), SIGNAL ( presetRatingChangedSignal ( unsigned int,int, PresetRatingType) ),
this, SLOT ( presetRatingChanged( unsigned int,int, PresetRatingType) ));
@ -1299,3 +1302,13 @@ void QProjectM_MainWindow::presetRatingChanged( unsigned int index, int rating,
playlistModel->notifyDataChanged(index);
}
void QProjectM_MainWindow::handleFailedPresetSwitch(const bool isHardCut, const unsigned int index,
const QString & message) {
const QString status = QString("Error switch to preset index %1: %2")
.arg(index).arg(message);
statusBar()->showMessage ( tr (status.toStdString().c_str() ) );
}

3
src/projectM-qt/qprojectm_mainwindow.hpp
View File

@ -116,6 +116,9 @@ protected:
private slots:
void dockLocationChanged(Qt::DockWidgetArea area);
void presetRatingChanged(unsigned int, int, PresetRatingType);
void handleFailedPresetSwitch(const bool isHardCut, const unsigned int index,
const QString & message);
void presetHardCut();
void presetSoftCut();
void insertPresetsDialog() ;