Merge pull request xbmc#1190 from anssih/fix/shairport-metadata-check

fixed: build with libshairport without ao_set_metadata
Montellese · Jul 21, 2012 · ea2f5f8 · ea2f5f8
2 parents c7015ec + 3cc6144
commit ea2f5f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/configure.in b/configure.in
@@ -1197,6 +1197,8 @@ if test "x$use_airtunes" != "xno"; then
   if test "x$use_airtunes" != "xno"; then
     XB_FIND_SONAME([SHAIRPORT], [shairport], [use_airtunes])
     USE_AIRTUNES=1
+    AC_CHECK_MEMBERS([struct AudioOutput.ao_set_metadata],,,
+                     [[#include <shairport/shairport.h>]])
   fi
 fi
 

diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
@@ -667,8 +667,10 @@ bool CAirTunesServer::Initialize(const CStdString &password)
     ao.ao_append_option = AudioOutputFunctions::ao_append_option;
     ao.ao_free_options = AudioOutputFunctions::ao_free_options;
     ao.ao_get_option = AudioOutputFunctions::ao_get_option;
+#ifdef HAVE_STRUCT_AUDIOOUTPUT_AO_SET_METADATA
     ao.ao_set_metadata = AudioOutputFunctions::ao_set_metadata;    
     ao.ao_set_metadata_coverart = AudioOutputFunctions::ao_set_metadata_coverart;        
+#endif
     struct printfPtr funcPtr;
     funcPtr.extprintf = shairport_log;