fix build w/o audio

aumuell · aumuell · commit eeb7110604da · 2026-04-14T14:06:25.000+02:00
diff --git a/.anari_deps/anari_viewer_imgui_glfw/9964740a47fda96ee937cfea272ccac85dc6a500.zip b/.anari_deps/anari_viewer_imgui_glfw/9964740a47fda96ee937cfea272ccac85dc6a500.zip
diff --git a/src/OpenCOVER/plugins/drivingsim/SteeringWheel/EngineSound.cpp b/src/OpenCOVER/plugins/drivingsim/SteeringWheel/EngineSound.cpp
@@ -12,6 +12,7 @@ using namespace opencover::audio;
 
 SoundStep::SoundStep(Player *p, float umin)
 {
+#ifdef HAVE_AUDIO
     player = p;
     speed = umin;
     if (p != NULL)
@@ -27,6 +28,7 @@ SoundStep::SoundStep(Player *p, float umin)
             source->setIntensity(0.0);
         }
     }
+#endif
     playing = false;
 }
 
@@ -38,19 +40,23 @@ void SoundStep::stop()
 {
     if (playing)
     {
+#ifdef HAVE_AUDIO
         //source->stop();
         if (source)
             source->setIntensity(0);
+#endif
         playing = false;
     }
 }
 void SoundStep::start()
 {
     if (!playing)
     {
+#ifdef HAVE_AUDIO
         //source->play();
         if (source)
             source->setIntensity(1);
+#endif
         playing = true;
     }
 }
@@ -179,6 +185,7 @@ void EngineSound::setSpeed(float s)
         else
         {
             sounds[i]->start();
+#ifdef HAVE_AUDIO
             if (s < sounds[i]->speed - (SPEED_STEP)) // einblenden
             {
                 if (sounds[i]->source)
@@ -199,6 +206,7 @@ void EngineSound::setSpeed(float s)
             }
             if (sounds[i]->source)
                 sounds[i]->source->setPitch(22000.0 + ((s - sounds[i]->speed) / (float)SPEED_STEP) * pitchValues[i]);
+#endif
             static int oldSample = -1;
             currentSample = i;
             if (currentSample != oldSample)
diff --git a/src/OpenCOVER/plugins/drivingsim/SteeringWheel/EngineSound.h b/src/OpenCOVER/plugins/drivingsim/SteeringWheel/EngineSound.h
@@ -9,10 +9,22 @@
 #define _EngineSound_H
 
 #include <string>
-#include <audio/Player.h>
 #include <cover/coVRTui.h>
-using namespace opencover;
+
+namespace opencover 
+{
+namespace audio
+{
+class Player;
+class Source;
+}
+}
+#ifdef HAVE_AUDIO
+#include <audio/Player.h>
+#endif
 using namespace opencover::audio;
+
+using namespace opencover;
 using namespace covise;
 
 #define NUM_SPEEDS 30
@@ -25,16 +37,16 @@ class SoundStep
     virtual ~SoundStep();
     void stop();
     void start();
-    std::shared_ptr<Source> source;
     float speed;
     bool playing;
-    Player *player;
+    std::shared_ptr<Source> source;
+    Player *player = nullptr;
 };
 
 class EngineSound : public coTUIListener
 {
 public:
-    Player *player;
+    Player *player = nullptr;
 
     EngineSound(Player *p);
     virtual ~EngineSound();
diff --git a/src/OpenCOVER/plugins/drivingsim/SteeringWheel/InputDevice.cpp b/src/OpenCOVER/plugins/drivingsim/SteeringWheel/InputDevice.cpp
@@ -604,6 +604,7 @@ InputDeviceMotionPlatform::InputDeviceMotionPlatform()
     ccSpeed = 0;
     ccActive = false;
 #ifndef USE_CAR_SOUND
+#ifdef HAVE_AUDIO
     anlasserSource = nullptr;
     Audio *anlasserAudio = new Audio("AnlasserInnen.wav");
     if (player)
@@ -616,6 +617,7 @@ InputDeviceMotionPlatform::InputDeviceMotionPlatform()
             anlasserSource->setIntensity(1.0);
         }
     }
+#endif
 #endif
 
     if (coVRMSController::instance()->isMaster())
diff --git a/src/OpenCOVER/plugins/drivingsim/SteeringWheel/Vehicle.cpp b/src/OpenCOVER/plugins/drivingsim/SteeringWheel/Vehicle.cpp
@@ -304,6 +304,7 @@ osg::Matrix *VrmlNodeVehicle::getCarTransMatrix()
 void VrmlNodeVehicle::init()
 {
 #ifndef USE_CAR_SOUND
+#ifdef HAVE_AUDIO
     source = nullptr;
     gearSound = nullptr;
     hornSound = nullptr;
@@ -341,6 +342,7 @@ void VrmlNodeVehicle::init()
             hornSound->setIntensity(1.0);
         }
     }
+#endif
 #else
     carSound = CarSound::instance();
 #endif
diff --git a/src/OpenCOVER/plugins/drivingsim/SteeringWheel/Vehicle.h b/src/OpenCOVER/plugins/drivingsim/SteeringWheel/Vehicle.h
@@ -36,7 +36,9 @@
 
 #include <util/coTypes.h>
 
+#ifdef HAVE_AUDIO
 #include <audio/Player.h>
+#endif
 #include <vrml97/vrml/config.h>
 #include <vrml97/vrml/VrmlNodeType.h>
 #include <vrml97/vrml/coEventQueue.h>
diff --git a/src/OpenCOVER/plugins/hlrs/JSBSim/JSBSim.cpp b/src/OpenCOVER/plugins/hlrs/JSBSim/JSBSim.cpp
@@ -53,6 +53,7 @@ JSBSimPlugin::JSBSimPlugin()
     fprintf(stderr, "JSBSimPlugin::JSBSimPlugin\n");
     geometryTrans = new osg::MatrixTransform();
 
+#ifdef HAVE_AUDIO
     audio::Player *player = cover->getPlayer();
     if (coVRMSController::instance()->isMaster() && player)
     {
@@ -72,6 +73,7 @@ JSBSimPlugin::JSBSimPlugin()
         engineSource->play();
         windSource->play();
     }
+#endif
     plugin = this;
     udp = 0;
 }
@@ -907,6 +909,7 @@ bool JSBSimPlugin::update()
                         float vSpeed = location.vUVW(3);
                         VzLabel->setText("Vz: " + std::to_string(vSpeed));
                         VLabel->setText("V: " + std::to_string(location.vUVW.Entry(1)) + " ; " + std::to_string(location.vUVW.Entry(2)) + " ; " + std::to_string(location.vUVW.Entry(3)));
+#ifdef HAVE_AUDIO
                         float pitch = -vSpeed / 10.0;
                         if (pitch < -1)
                             pitch = -1;
@@ -926,6 +929,7 @@ bool JSBSimPlugin::update()
                         varioSource->setIntensity(vol);
                         if (vol > 1.0)
                             vol = 1.0;
+#endif
 
                         Winds->SetWindNED(currentVelocity.y(), currentVelocity.x(), -currentVelocity.z());
                         Winds->SetTurbGain(currentTurbulence);
@@ -979,6 +983,10 @@ void JSBSimPlugin::setEnabled(bool flag)
         if (flag)
         {
             reset();
+        }
+#ifdef HAVE_AUDIO
+        if (flag)
+        {
             varioSource->play();
             windSource->play();
             engineSource->play();
@@ -989,6 +997,7 @@ void JSBSimPlugin::setEnabled(bool flag)
             windSource->stop();
             engineSource->stop();
         }
+#endif
         if (udp)
         {
             if (flag)
diff --git a/src/OpenCOVER/plugins/hlrs/JSBSim/JSBSim.h b/src/OpenCOVER/plugins/hlrs/JSBSim/JSBSim.h
@@ -27,8 +27,10 @@
 #include <config/CoviseConfig.h>
 #include <util/byteswap.h>
 #include <net/covise_connect.h>
+#ifdef HAVE_AUDIO
 #include <audio/Audio.h>
 #include <audio/Player.h>
+#endif
 
 #include <initialization/FGTrim.h>
 #include <FGFDMExec.h>
@@ -201,12 +203,14 @@ class JSBSimPlugin : public coVRPlugin, public ui::Owner, public opencover::coVR
     osg::Vec3 targetVelocity;
     float targetTurbulence;
 
+#ifdef HAVE_AUDIO
     audio::Audio engineAudio;
     audio::Audio varioAudio;
     audio::Audio windAudio;
     std::shared_ptr<audio::Source> engineSource;
     std::shared_ptr<audio::Source> varioSource;
     std::shared_ptr<audio::Source> windSource;
+#endif
 
     std::string host;
     unsigned short serverPort;

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ using namespace opencover::audio;`
`12`	`12`
`13`	`13`	`SoundStep::SoundStep(Player *p, float umin)`
`14`	`14`	`{`
	`15`	`+#ifdef HAVE_AUDIO`
`15`	`16`	`player = p;`
`16`	`17`	`speed = umin;`
`17`	`18`	`if (p != NULL)`
`@@ -27,6 +28,7 @@ SoundStep::SoundStep(Player *p, float umin)`
`27`	`28`	`source->setIntensity(0.0);`
`28`	`29`	`}`
`29`	`30`	`}`
	`31`	`+#endif`
`30`	`32`	`playing = false;`
`31`	`33`	`}`
`32`	`34`
`@@ -38,19 +40,23 @@ void SoundStep::stop()`
`38`	`40`	`{`
`39`	`41`	`if (playing)`
`40`	`42`	`{`
	`43`	`+#ifdef HAVE_AUDIO`
`41`	`44`	`//source->stop();`
`42`	`45`	`if (source)`
`43`	`46`	`source->setIntensity(0);`
	`47`	`+#endif`
`44`	`48`	`playing = false;`
`45`	`49`	`}`
`46`	`50`	`}`
`47`	`51`	`void SoundStep::start()`
`48`	`52`	`{`
`49`	`53`	`if (!playing)`
`50`	`54`	`{`
	`55`	`+#ifdef HAVE_AUDIO`
`51`	`56`	`//source->play();`
`52`	`57`	`if (source)`
`53`	`58`	`source->setIntensity(1);`
	`59`	`+#endif`
`54`	`60`	`playing = true;`
`55`	`61`	`}`
`56`	`62`	`}`
`@@ -179,6 +185,7 @@ void EngineSound::setSpeed(float s)`
`179`	`185`	`else`
`180`	`186`	`{`
`181`	`187`	`sounds[i]->start();`
	`188`	`+#ifdef HAVE_AUDIO`
`182`	`189`	`if (s < sounds[i]->speed - (SPEED_STEP)) // einblenden`
`183`	`190`	`{`
`184`	`191`	`if (sounds[i]->source)`
`@@ -199,6 +206,7 @@ void EngineSound::setSpeed(float s)`
`199`	`206`	`}`
`200`	`207`	`if (sounds[i]->source)`
`201`	`208`	`sounds[i]->source->setPitch(22000.0 + ((s - sounds[i]->speed) / (float)SPEED_STEP) * pitchValues[i]);`
	`209`	`+#endif`
`202`	`210`	`static int oldSample = -1;`
`203`	`211`	`currentSample = i;`
`204`	`212`	`if (currentSample != oldSample)`
Original file line number	Diff line number	Diff line change
`@@ -604,6 +604,7 @@ InputDeviceMotionPlatform::InputDeviceMotionPlatform()`
`604`	`604`	`ccSpeed = 0;`
`605`	`605`	`ccActive = false;`
`606`	`606`	`#ifndef USE_CAR_SOUND`
	`607`	`+#ifdef HAVE_AUDIO`
`607`	`608`	`anlasserSource = nullptr;`
`608`	`609`	`Audio *anlasserAudio = new Audio("AnlasserInnen.wav");`
`609`	`610`	`if (player)`
`@@ -616,6 +617,7 @@ InputDeviceMotionPlatform::InputDeviceMotionPlatform()`
`616`	`617`	`anlasserSource->setIntensity(1.0);`
`617`	`618`	`}`
`618`	`619`	`}`
	`620`	`+#endif`
`619`	`621`	`#endif`
`620`	`622`
`621`	`623`	`if (coVRMSController::instance()->isMaster())`
Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,7 @@ osg::Matrix *VrmlNodeVehicle::getCarTransMatrix()`
`304`	`304`	`void VrmlNodeVehicle::init()`
`305`	`305`	`{`
`306`	`306`	`#ifndef USE_CAR_SOUND`
	`307`	`+#ifdef HAVE_AUDIO`
`307`	`308`	`source = nullptr;`
`308`	`309`	`gearSound = nullptr;`
`309`	`310`	`hornSound = nullptr;`
`@@ -341,6 +342,7 @@ void VrmlNodeVehicle::init()`
`341`	`342`	`hornSound->setIntensity(1.0);`
`342`	`343`	`}`
`343`	`344`	`}`
	`345`	`+#endif`
`344`	`346`	`#else`
`345`	`347`	`carSound = CarSound::instance();`
`346`	`348`	`#endif`