From 5c4e921899737258c9c76dfd2d347609f078b105 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 9 Apr 2014 12:58:48 +0200 Subject: [PATCH] Compilation error when PHONON not present --- companion/src/modeledit/customfunctions.cpp | 5 ++++- companion/src/modeledit/customfunctions.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/companion/src/modeledit/customfunctions.cpp b/companion/src/modeledit/customfunctions.cpp index e6a200b25..b625f383d 100644 --- a/companion/src/modeledit/customfunctions.cpp +++ b/companion/src/modeledit/customfunctions.cpp @@ -49,10 +49,13 @@ void RepeatComboBox::update() CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings): ModelPanel(parent, model, generalSettings), - initialized(false), + initialized(false) +#if defined(PHONON) + , phononCurrent(-1), clickObject(NULL), clickOutput(NULL) +#endif { QGridLayout * gridLayout = new QGridLayout(this); diff --git a/companion/src/modeledit/customfunctions.h b/companion/src/modeledit/customfunctions.h index 6b908a2a7..b9b60f17d 100644 --- a/companion/src/modeledit/customfunctions.h +++ b/companion/src/modeledit/customfunctions.h @@ -45,9 +45,9 @@ class CustomFunctionsPanel : public ModelPanel void customFunctionEdited(); void fsw_customContextMenuRequested(QPoint pos); void refreshCustomFunction(int index, bool modified=false); - void playMusic(); void onChildModified(); #ifdef PHONON + void playMusic(); void mediaPlayer_state(Phonon::State newState, Phonon::State oldState); #endif void fswDelete();