only include from current directory with ""

also uniformly use <al.h> instead of <OpenAL/al.h> or <AL/al.h>, as CMake takes care of this

Author: aumuell

src/OpenCOVER/audio/AlutContext.cpp

@@ -1,5 +1,5 @@
 #include "AlutContext.h"
-#include "AL/alut.h"
+#include <AL/alut.h>
 
 using namespace opencover::audio;
 

src/OpenCOVER/audio/Audio.cpp

@@ -5,8 +5,8 @@
 
  * License: LGPL 2+ */
 
-#include "AL/al.h"
-#include "AL/alut.h"
+#include <al.h>
+#include <AL/alut.h>
 
 #include "Audio.h"
 #include <util/coErr.h>

src/OpenCOVER/audio/Audio.h

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <string>
 #include <util/coExport.h>
-// do not include al.h here, otherwise we need OpenAL dependency everywhere #include "AL/al.h"
+// do not include al.h here, otherwise we need OpenAL dependency everywhere #include <al.h>
 typedef unsigned int ALuint;
 
 namespace opencover::audio

src/OpenCOVER/audio/Player.cpp

@@ -13,9 +13,9 @@
 
 #include <config/CoviseConfig.h>
 
-#include "audio/PlayerAServer.h"
-#include "audio/PlayerOpenAL.h"
-#include "audio/PlayerOsc.h"
+#include "PlayerAServer.h"
+#include "PlayerOpenAL.h"
+#include "PlayerOsc.h"
 
 using std::endl;
 using namespace opencover::audio;

src/OpenCOVER/audio/PlayerOpenAL.cpp

@@ -10,13 +10,10 @@
 
 using namespace opencover::audio;
 
-#if defined(__APPLE__)
-#include <OpenAL/al.h>
-#include <OpenAL/alc.h>
-#else
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alext.h>
+#include <al.h>
+#include <alc.h>
+#ifndef __APPLE__
+#include <alext.h>
 #endif
 
 #include <AL/alut.h>
@@ -65,7 +62,7 @@ PlayerOpenAL::makeSource(const Audio *audio)
     return std::make_unique<PlayerOpenAL::Source>(this, audio);
 }
 
-PlayerOpenAL::Source::Source(Player* player, const Audio *audio)
+PlayerOpenAL::Source::Source(Player *player, const Audio *audio)
     : opencover::audio::Source(player, audio)
 {
     alGenSources(1, &alSource);

src/OpenCOVER/audio/PlayerOpenAL.h

@@ -10,11 +10,7 @@
 
 #include "Player.h"
 
-#if defined(__APPLE__)
-#include <OpenAL/al.h>
-#else
-#include <AL/al.h>
-#endif
+#include <al.h>
 #include <util/coExport.h>
 
 #include "AlutContext.h"
@@ -34,7 +30,7 @@ class COVRAUDIOEXPORT PlayerOpenAL : public Player
     class Source : public opencover::audio::Source
     {
     public:
-        Source(Player* player, const Audio *audio);
+        Source(Player *player, const Audio *audio);
         virtual ~Source();
 
         virtual void setLoop(bool loop) override;

src/OpenCOVER/audio/PlayerOsc.cpp

@@ -6,7 +6,7 @@
  * License: LGPL 2+ */
 
 #include "PlayerOsc.h"
-#include "net/covise_host.h"
+#include <net/covise_host.h>
 #include <fcntl.h>
 #include <memory>
 #include <sys/types.h>