Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #3278 from t-nelson/ae_fixes

AE nits
  • Loading branch information...
commit 95a165e5e6f93f9284ccc4a64cccdab7922196c8 2 parents b23fae6 + 8abcd38
@MartijnKaijser MartijnKaijser authored
Showing with 36 additions and 53 deletions.
  1. +5 −22 xbmc/cores/AudioEngine/AEFactory.cpp
  2. +1 −1  xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
  3. +1 −1  xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResample.h
  4. +1 −1  xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp
  5. +1 −1  xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h
  6. +1 −1  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAESound.cpp
  7. +1 −1  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAEStream.h
  8. +1 −1  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioMixMap.h
  9. +1 −1  xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioAEHAL.h
  10. +1 −1  xbmc/cores/AudioEngine/Engines/CoreAudio/ICoreAudioSource.h
  11. +1 −1  xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.h
  12. +1 −1  xbmc/cores/AudioEngine/Engines/SoftAE/SoftAESound.cpp
  13. +1 −1  xbmc/cores/AudioEngine/Engines/SoftAE/SoftAEStream.h
  14. +1 −1  xbmc/cores/AudioEngine/Interfaces/AE.h
  15. +1 −1  xbmc/cores/AudioEngine/Interfaces/AEEncoder.h
  16. +1 −1  xbmc/cores/AudioEngine/Interfaces/AESink.h
  17. +1 −1  xbmc/cores/AudioEngine/Interfaces/AEStream.h
  18. +1 −1  xbmc/cores/AudioEngine/{ → Utils}/AEAudioFormat.h
  19. +1 −1  xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp
  20. +1 −1  xbmc/cores/AudioEngine/Utils/AEChannelInfo.h
  21. +1 −1  xbmc/cores/AudioEngine/Utils/AEConvert.h
  22. +1 −1  xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h
  23. +1 −1  xbmc/cores/AudioEngine/Utils/AELimiter.h
  24. +1 −1  xbmc/cores/AudioEngine/Utils/AERemap.h
  25. +1 −1  xbmc/cores/AudioEngine/Utils/AEUtil.h
  26. +1 −1  xbmc/cores/AudioEngine/Utils/AEWAVLoader.h
  27. +1 −1  xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h
  28. +1 −1  xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h
  29. +1 −1  xbmc/cores/dvdplayer/DVDPlayerAudio.h
  30. +1 −1  xbmc/cores/omxplayer/OMXAudio.h
  31. +1 −1  xbmc/cores/omxplayer/OMXAudioCodecOMX.h
  32. +1 −1  xbmc/cores/paplayer/ICodec.h
View
27 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;
}
View
2  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>
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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>
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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"
View
2  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;
View
2  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
View
2  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>
View
2  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>
View
2  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
View
2  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";
View
2  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);
View
2  xbmc/cores/AudioEngine/Utils/AEConvert.h
@@ -20,7 +20,7 @@
*/
#include <stdint.h>
-#include "../AEAudioFormat.h"
+#include "AEAudioFormat.h"
class CAEConvert{
private:
View
2  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;
View
2  xbmc/cores/AudioEngine/Utils/AELimiter.h
@@ -20,7 +20,7 @@
*/
#include <algorithm>
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
class CAELimiter
{
View
2  xbmc/cores/AudioEngine/Utils/AERemap.h
@@ -19,7 +19,7 @@
*
*/
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
class CAERemap {
public:
View
2  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>
View
2  xbmc/cores/AudioEngine/Utils/AEWAVLoader.h
@@ -20,7 +20,7 @@
*/
#include "utils/StdString.h"
-#include "cores/AudioEngine/AEAudioFormat.h"
+#include "AEAudioFormat.h"
class CAEWAVLoader
{
View
2  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"
View
2  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"
View
2  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>
View
2  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"
View
2  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"
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.