Enable the ao_set_metadata* functions if available from libshairport.

Montellese · Jun 17, 2012 · 537bec4 · 537bec4
1 parent d69e59f
commit 537bec4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/configure.in b/configure.in
@@ -1188,6 +1188,7 @@ 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(AudioOutput.ao_set_metadata AudioOutput.ao_set_metadata_coverart)
   fi
 fi
 

diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
@@ -389,6 +389,7 @@ int CAirTunesServer::AudioOutputFunctions::ao_close(ao_device *device)
   return 0;
 }
 
+#ifdef HAVE_AUDIOOUTPUT_AO_SET_METADATA_AUDIOOUTPUT_AO_SET_METADATA_COVERART
 void CAirTunesServer::AudioOutputFunctions::ao_set_metadata(const char *buffer, unsigned int size)
 {
   CAirTunesServer::SetMetadataFromBuffer(buffer, size);
@@ -398,6 +399,7 @@ void CAirTunesServer::AudioOutputFunctions::ao_set_metadata_coverart(const char
 {
   CAirTunesServer::SetCoverArtFromBuffer(buffer, size);
 }
+#endif
 
 /* -- Device Setup/Playback/Teardown -- */
 int CAirTunesServer::AudioOutputFunctions::ao_append_option(ao_option **options, const char *key, const char *value)
@@ -667,8 +669,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;
-    ao.ao_set_metadata = AudioOutputFunctions::ao_set_metadata;    
-    ao.ao_set_metadata_coverart = AudioOutputFunctions::ao_set_metadata_coverart;        
+#ifdef HAVE_AUDIOOUTPUT_AO_SET_METADATA_AUDIOOUTPUT_AO_SET_METADATA_COVERART
+    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;
 

diff --git a/xbmc/network/AirTunesServer.h b/xbmc/network/AirTunesServer.h
@@ -96,8 +96,10 @@ class CAirTunesServer : public CThread
       static int ao_append_option(ao_option **options, const char *key, const char *value);
       static void ao_free_options(ao_option *options);
       static char* ao_get_option(ao_option *options, const char* key);
+#ifdef HAVE_AUDIOOUTPUT_AO_SET_METADATA_AUDIOOUTPUT_AO_SET_METADATA_COVERART
       static void ao_set_metadata(const char *buffer, unsigned int size);
-      static void ao_set_metadata_coverart(const char *buffer, unsigned int size);      
+      static void ao_set_metadata_coverart(const char *buffer, unsigned int size);
+#endif
 #endif
     };
 };