Merge pull request #3278 from t-nelson/ae_fixes

AE nits
xbmc · Sep 16, 2013 · 95a165e · 95a165e
2 parents b23fae6 + 8abcd38
commit 95a165e
Show file tree

Hide file tree

Showing 32 changed files with 36 additions and 53 deletions.
diff --git a/xbmc/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp
@@ -49,13 +49,14 @@ IAE *CAEFactory::GetEngine()
 
 bool CAEFactory::LoadEngine()
 {
+  bool loaded = false;
+
 #if defined(TARGET_RASPBERRY_PI)
   return true;
+#elif defined(TARGET_DARWIN)
+  return CAEFactory::LoadEngine(AE_ENGINE_COREAUDIO);
 #endif
 
-  bool loaded = false;
-
-#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
   std::string engine;
   if (getenv("AE_ENGINE"))
   {
@@ -66,39 +67,21 @@ bool CAEFactory::LoadEngine()
     if (!loaded && engine == "PULSE")
       loaded = CAEFactory::LoadEngine(AE_ENGINE_PULSE);
     #endif
+
     if (!loaded && engine == "SOFT" )
       loaded = CAEFactory::LoadEngine(AE_ENGINE_SOFT);
-    if (!loaded && engine == "ACTIVE")
-      loaded = CAEFactory::LoadEngine(AE_ENGINE_ACTIVE);
-  }
-#endif
 
-#if defined(TARGET_WINDOWS)
-  std::string engine;
-  if (getenv("AE_ENGINE"))
-  {
-    engine = (std::string)getenv("AE_ENGINE");
-    std::transform(engine.begin(), engine.end(), engine.begin(), ::toupper);
-
-    if (!loaded && engine == "SOFT" )
-      loaded = CAEFactory::LoadEngine(AE_ENGINE_SOFT);
     if (!loaded && engine == "ACTIVE")
       loaded = CAEFactory::LoadEngine(AE_ENGINE_ACTIVE);
   }
-#endif
 
 #if defined(HAS_PULSEAUDIO)
   if (!loaded)
     loaded = CAEFactory::LoadEngine(AE_ENGINE_PULSE);
 #endif
 
-#if defined(TARGET_DARWIN)
-  if (!loaded)
-    loaded = CAEFactory::LoadEngine(AE_ENGINE_COREAUDIO);
-#else
   if (!loaded)
     loaded = CAEFactory::LoadEngine(AE_ENGINE_ACTIVE);
-#endif
 
   return loaded;
 }

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
@@ -21,7 +21,7 @@
 
 #include "DllAvUtil.h"
 #include "DllSwResample.h"
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 #include "Interfaces/AE.h"
 #include <deque>
 

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResample.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResample.h
@@ -22,7 +22,7 @@
 #include "DllAvUtil.h"
 #include "DllSwResample.h"
 #include "Utils/AEChannelInfo.h"
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 #include "ActiveAEBuffer.h"
 #include "Interfaces/AE.h"
 

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp
@@ -21,7 +21,7 @@
 #include "Interfaces/AESound.h"
 
 #include "AEFactory.h"
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 #include "ActiveAE.h"
 #include "ActiveAESound.h"
 #include "utils/log.h"

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "AEAudioFormat.h"
 #include "Interfaces/AEStream.h"
+#include "Utils/AEAudioFormat.h"
 #include "Utils/AELimiter.h"
 #include "Utils/AEConvert.h"
 

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.cpp b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.cpp
@@ -25,7 +25,7 @@
 #include "CoreAudioAE.h"
 #include "threads/SingleLock.h"
 #include "cores/AudioEngine/AEFactory.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Interfaces/AESound.h"
 #include "cores/AudioEngine/Utils/AEConvert.h"
 #include "cores/AudioEngine/Utils/AERemap.h"

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEStream.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEStream.h
@@ -23,7 +23,7 @@
 #include <list>
 
 #include "ICoreAudioSource.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Interfaces/AEStream.h"
 #include "cores/AudioEngine/Utils/AEConvert.h"
 #include "cores/AudioEngine/Utils/AERemap.h"

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioMixMap.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioMixMap.h
@@ -23,7 +23,7 @@
 
 #if defined(TARGET_DARWIN_OSX)
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 
 #include <CoreAudio/CoreAudio.h>
 

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioAEHAL.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioAEHAL.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Interfaces/AE.h"
 #include "ICoreAudioSource.h"
 

diff --git a/xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioSource.h b/xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioSource.h
@@ -21,7 +21,7 @@
 
 #include <AudioUnit/AudioUnit.h>
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Interfaces/AE.h"
 #include "utils/StdString.h"
 

diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
@@ -30,7 +30,7 @@
 
 #include "Interfaces/ThreadedAE.h"
 #include "Utils/AEBuffer.h"
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 #include "AESinkFactory.h"
 
 #include "SoftAEStream.h"

diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAESound.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAESound.cpp
@@ -26,7 +26,7 @@
 #include "utils/EndianSwap.h"
 
 #include "AEFactory.h"
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 
 #include "SoftAE.h"
 #include "SoftAESound.h"

diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAEStream.h b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAEStream.h
@@ -24,7 +24,7 @@
 
 #include "threads/SharedSection.h"
 
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 #include "Interfaces/AEStream.h"
 #include "Utils/AEConvert.h"
 #include "Utils/AERemap.h"

diff --git a/xbmc/cores/AudioEngine/Interfaces/AE.h b/xbmc/cores/AudioEngine/Interfaces/AE.h
@@ -25,7 +25,7 @@
 #include "system.h"
 #include "threads/CriticalSection.h"
 
-#include "../AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 
 typedef std::pair<std::string, std::string> AEDevice;
 typedef std::vector<AEDevice> AEDeviceList;

diff --git a/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h b/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h
@@ -20,7 +20,7 @@
  */
 
 #include "DllAvCodec.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 
 /**
  * IAEEncoder interface for on the fly audio compression

diff --git a/xbmc/cores/AudioEngine/Interfaces/AESink.h b/xbmc/cores/AudioEngine/Interfaces/AESink.h
@@ -21,7 +21,7 @@
 
 #include "threads/Thread.h"
 #include "AE.h"
-#include "AEAudioFormat.h"
+#include "Utils/AEAudioFormat.h"
 #include "utils/StdString.h"
 #include <stdint.h>
 

diff --git a/xbmc/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/IAudioCallback.h"
 #include <stdint.h>
 

diff --git a/xbmc/cores/AudioEngine/AEAudioFormat.h → xbmc/cores/AudioEngine/Utils/AEAudioFormat.h b/xbmc/cores/AudioEngine/AEAudioFormat.h → xbmc/cores/AudioEngine/Utils/AEAudioFormat.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "Utils/AEChannelInfo.h"
+#include "AEChannelInfo.h"
 
 /**
  * The various data formats

diff --git a/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
@@ -221,7 +221,7 @@ const enum AEChannel CAEChannelInfo::operator[](unsigned int i) const
   return m_channels[i];
 }
 
-CAEChannelInfo::operator std::string()
+CAEChannelInfo::operator std::string() const
 {
   if (m_channelCount == 0)
     return "NULL";

diff --git a/xbmc/cores/AudioEngine/Utils/AEChannelInfo.h b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.h
@@ -83,7 +83,7 @@ class CAEChannelInfo {
   CAEChannelInfo& operator+=(const enum AEChannel& rhs);
   CAEChannelInfo& operator-=(const enum AEChannel& rhs);
   const enum AEChannel operator[](unsigned int i) const;
-  operator std::string();
+  operator std::string() const;
 
   /* remove any channels that dont exist in the provided info */
   void ResolveChannels(const CAEChannelInfo& rhs);

diff --git a/xbmc/cores/AudioEngine/Utils/AEConvert.h b/xbmc/cores/AudioEngine/Utils/AEConvert.h
@@ -20,7 +20,7 @@
  */
 
 #include <stdint.h>
-#include "../AEAudioFormat.h"
+#include "AEAudioFormat.h"
 
 class CAEConvert{
 private:

diff --git a/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h b/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h
@@ -21,7 +21,7 @@
 
 #include <string>
 #include <vector>
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
 #include "cores/AudioEngine/Utils/AEChannelInfo.h"
 
 typedef std::vector<unsigned int     > AESampleRateList;

diff --git a/xbmc/cores/AudioEngine/Utils/AELimiter.h b/xbmc/cores/AudioEngine/Utils/AELimiter.h
@@ -20,7 +20,7 @@
  */
 
 #include <algorithm>
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
 
 class CAELimiter
 {

diff --git a/xbmc/cores/AudioEngine/Utils/AERemap.h b/xbmc/cores/AudioEngine/Utils/AERemap.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
 
 class CAERemap {
 public:

diff --git a/xbmc/cores/AudioEngine/Utils/AEUtil.h b/xbmc/cores/AudioEngine/Utils/AEUtil.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../AEAudioFormat.h"
+#include "AEAudioFormat.h"
 #include "utils/StdString.h"
 #include "PlatformDefs.h"
 #include <math.h>

diff --git a/xbmc/cores/AudioEngine/Utils/AEWAVLoader.h b/xbmc/cores/AudioEngine/Utils/AEWAVLoader.h
@@ -20,7 +20,7 @@
  */
 
 #include "utils/StdString.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
 
 class CAEWAVLoader
 {

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h
@@ -21,7 +21,7 @@
  */
 
 #include "system.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 
 #if (defined HAVE_CONFIG_H) && (!defined TARGET_WINDOWS)
   #include "config.h"

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
@@ -24,7 +24,7 @@
 
 #include "system.h"
 #include "DVDAudioCodec.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Utils/AEStreamInfo.h"
 #include "cores/AudioEngine/Utils/AEBitstreamPacker.h"
 

diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
@@ -28,7 +28,7 @@
 #include "DVDStreamInfo.h"
 #include "utils/BitstreamStats.h"
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 
 #include <list>
 #include <queue>

diff --git a/xbmc/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h
@@ -27,7 +27,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "cores/AudioEngine/Utils/AEUtil.h"
 #include "cores/AudioEngine/Utils/AERemap.h"
 #include "cores/IAudioCallback.h"

diff --git a/xbmc/cores/omxplayer/OMXAudioCodecOMX.h b/xbmc/cores/omxplayer/OMXAudioCodecOMX.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 #include "DllAvCodec.h"
 #include "DllAvFormat.h"
 #include "DllAvUtil.h"

diff --git a/xbmc/cores/paplayer/ICodec.h b/xbmc/cores/paplayer/ICodec.h
@@ -24,7 +24,7 @@
 #include "filesystem/File.h"
 #include "music/tags/MusicInfoTag.h"
 
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "cores/AudioEngine/Utils/AEAudioFormat.h"
 
 #define READ_EOF      -1
 #define READ_SUCCESS   0