summaryrefslogtreecommitdiff
path: root/muse2/muse
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-09-28 17:39:40 +0000
committerFlorian Jung <flo@windfisch.org>2012-09-28 17:39:40 +0000
commitd0da68f0de3c5209c40b4d6d1277f6b942daf1af (patch)
tree5c5cc47346bc612bed7220fe43251eb2ae30bd42 /muse2/muse
parentedd3eb6d5b73b2868398bef6ae7fbb6fd92c5800 (diff)
compile fix: don't use DSSI-related stuff when compiling without
DSSI-support.
Diffstat (limited to 'muse2/muse')
-rw-r--r--muse2/muse/arranger/tlist.cpp1
-rw-r--r--muse2/muse/audiotrack.cpp8
-rw-r--r--muse2/muse/track.cpp2
3 files changed, 11 insertions, 0 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index 9297e7a8..76dd18ff 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -69,6 +69,7 @@
#include "undo.h"
#include "midi_audio_control.h"
#include "ctrl.h"
+#include "plugin.h"
#ifdef DSSI_SUPPORT
#include "dssihost.h"
diff --git a/muse2/muse/audiotrack.cpp b/muse2/muse/audiotrack.cpp
index f9d8a6bd..b9e245d2 100644
--- a/muse2/muse/audiotrack.cpp
+++ b/muse2/muse/audiotrack.cpp
@@ -832,6 +832,7 @@ double AudioTrack::pluginCtrlVal(int ctlID) const
{
if(type() == AUDIO_SOFTSYNTH)
{
+#ifdef DSSI_SUPPORT
const SynthI* synth = static_cast<const SynthI*>(this);
if(synth->synth() && synth->synth()->synthType() == Synth::DSSI_SYNTH)
{
@@ -844,6 +845,7 @@ double AudioTrack::pluginCtrlVal(int ctlID) const
en_2 = dssi_sif->controllerEnabled2(in_ctrl_idx);
}
}
+#endif
}
}
}
@@ -888,6 +890,7 @@ bool AudioTrack::addScheduledControlEvent(int track_ctrl_id, float val, unsigned
{
if(type() == AUDIO_SOFTSYNTH)
{
+ #ifdef DSSI_SUPPORT
const SynthI* synth = static_cast<const SynthI*>(this);
if(synth->synth() && synth->synth()->synthType() == Synth::DSSI_SYNTH)
{
@@ -899,6 +902,7 @@ bool AudioTrack::addScheduledControlEvent(int track_ctrl_id, float val, unsigned
return dssi_sif->addScheduledControlEvent(in_ctrl_idx, val, frame);
}
}
+ #endif
}
}
}
@@ -930,6 +934,7 @@ void AudioTrack::enableController(int track_ctrl_id, bool en)
{
if(type() == AUDIO_SOFTSYNTH)
{
+#ifdef DSSI_SUPPORT
SynthI* synth = static_cast<SynthI*>(this);
if(synth->synth() && synth->synth()->synthType() == Synth::DSSI_SYNTH)
{
@@ -941,6 +946,7 @@ void AudioTrack::enableController(int track_ctrl_id, bool en)
dssi_sif->enableController(in_ctrl_idx, en);
}
}
+#endif
}
}
}
@@ -977,6 +983,7 @@ void AudioTrack::controllersEnabled(int track_ctrl_id, bool* en1, bool* en2) con
{
if(type() == AUDIO_SOFTSYNTH)
{
+#ifdef DSSI_SUPPORT
const SynthI* synth = static_cast<const SynthI*>(this);
if(synth->synth() && synth->synth()->synthType() == Synth::DSSI_SYNTH)
{
@@ -989,6 +996,7 @@ void AudioTrack::controllersEnabled(int track_ctrl_id, bool* en1, bool* en2) con
en_2 = dssi_sif->controllerEnabled2(in_ctrl_idx);
}
}
+#endif
}
}
}
diff --git a/muse2/muse/track.cpp b/muse2/muse/track.cpp
index bf1b5a7a..0fa419c6 100644
--- a/muse2/muse/track.cpp
+++ b/muse2/muse/track.cpp
@@ -389,6 +389,7 @@ void Track::clearRecAutomation(bool clearList)
if(type() == AUDIO_SOFTSYNTH)
{
+#ifdef DSSI_SUPPORT
SynthI* synth = static_cast<SynthI*>(this);
if(synth->synth() && synth->synth()->synthType() == Synth::DSSI_SYNTH)
{
@@ -399,6 +400,7 @@ void Track::clearRecAutomation(bool clearList)
dssi_sif->enableAllControllers(true);
}
}
+#endif
}
if(clearList)