diff options
author | Memphiz <memphis@machzwo.de> | 2012-05-09 18:53:45 +0200 |
---|---|---|
committer | Memphiz <memphis@machzwo.de> | 2012-06-02 01:06:45 +0200 |
commit | b7fb4615609c684a98dc1cc27906aaa0f117837f (patch) | |
tree | 1156f8adf549f575188312452e8a5541d93f71f6 | |
parent | bfd1636e5c5b90a0e99ae9552ba834934b805492 (diff) |
[airtunes] - add dmap metadata parsing
-rw-r--r-- | xbmc/network/AirTunesServer.cpp | 13 | ||||
-rw-r--r-- | xbmc/network/AirTunesServer.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp index e14da90d74..2ad097e8e5 100644 --- a/xbmc/network/AirTunesServer.cpp +++ b/xbmc/network/AirTunesServer.cpp @@ -47,7 +47,6 @@ #include <map> #include <string> - using namespace XFILE; #if defined(TARGET_WINDOWS) @@ -390,6 +389,16 @@ int CAirTunesServer::AudioOutputFunctions::ao_close(ao_device *device) return 0; } +void CAirTunesServer::AudioOutputFunctions::ao_set_metadata(const char *buffer, unsigned int size) +{ + CAirTunesServer::SetMetadataFromBuffer(buffer, size); +} + +void CAirTunesServer::AudioOutputFunctions::ao_set_metadata_coverart(const char *buffer, unsigned int size) +{ + CAirTunesServer::SetCoverArtFromBuffer(buffer, size); +} + /* -- Device Setup/Playback/Teardown -- */ int CAirTunesServer::AudioOutputFunctions::ao_append_option(ao_option **options, const char *key, const char *value) { @@ -658,6 +667,8 @@ 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; struct printfPtr funcPtr; funcPtr.extprintf = shairport_log; diff --git a/xbmc/network/AirTunesServer.h b/xbmc/network/AirTunesServer.h index 4a30e0a1e8..0a4ce5acf1 100644 --- a/xbmc/network/AirTunesServer.h +++ b/xbmc/network/AirTunesServer.h @@ -96,6 +96,8 @@ private: 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); + static void ao_set_metadata(const char *buffer, unsigned int size); + static void ao_set_metadata_coverart(const char *buffer, unsigned int size); #endif }; }; |