Skip to content
This repository
Browse code

[IOS] - fix build after 6095130

  • Loading branch information...
commit f12ee05612ebef348d0db7e081c0f553b0ed66ac 1 parent 2205284
Memphiz authored January 25, 2013
2  addons/skin.touched
... ...
@@ -1 +1 @@
1  
-Subproject commit 932a728725889c4220bc4ac42f18b082e4361f86
  1
+Subproject commit 1d03746646111f97e28b807a290bd762c7db547c
4  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.cpp
@@ -275,10 +275,12 @@ bool CCoreAudioAE::OpenCoreAudio(unsigned int sampleRate, bool forceRaw,
275 275
     streamLock.Leave();
276 276
   }
277 277
   
  278
+#if defined(TARGET_DARWIN_OSX)
278 279
   if (m_Initialized)
279 280
   {
280 281
     m_currentAudioDevice = CCoreAudioHardware::FindAudioDevice(m_outputDevice);
281 282
   }
  283
+#endif
282 284
 
283 285
   return m_Initialized;
284 286
 }
@@ -451,6 +453,7 @@ IAEStream* CCoreAudioAE::MakeStream(enum AEDataFormat dataFormat,
451 453
   m_streams.push_back(stream);
452 454
   streamLock.Leave();
453 455
 
  456
+#if defined(TARGET_DARWIN_OSX)
454 457
   // check if default device has changed - in that case we need to reinit
455 458
   // TODO hook into osx callbacks for getting notifiaction on device
456 459
   // changes and then queue a change of the default device
@@ -462,6 +465,7 @@ IAEStream* CCoreAudioAE::MakeStream(enum AEDataFormat dataFormat,
462 465
     if (currentId != m_currentAudioDevice)
463 466
       defaultDeviceChanged = true;
464 467
   }
  468
+#endif
465 469
 
466 470
   if ((options & AESTREAM_PAUSED) == 0)
467 471
     Stop();
1  xbmc/cores/AudioEngine/Engines/CoreAudio/CoreAudioAE.h
@@ -33,6 +33,7 @@
33 33
 
34 34
 #if defined(TARGET_DARWIN_IOS)
35 35
 #include "CoreAudioAEHALIOS.h"
  36
+#define AudioDeviceID unsigned
36 37
 #else
37 38
 #include "CoreAudioAEHALOSX.h"
38 39
 #endif

0 notes on commit f12ee05

Memphiz

Booaahhh ich krieg zuviel!

Please sign in to comment.
Something went wrong with that request. Please try again.