Skip to content
This repository
Browse code

airplay: switch to non apple tv name

This makes discovery of xbmc more reliable in mac osx.

Thanx to matli on forum for find.

Signed-off-by: Joakim Plate <elupus@ecce.se>
Signed-off-by: Memphiz <memphis@machzwo.de>
  • Loading branch information...
commit 77ede9aac30e241df44839312bfd83aec94b37bf 1 parent ca8f3f7
Joakim Plate authored February 20, 2013
2  xbmc/Application.cpp
@@ -1589,7 +1589,7 @@ bool CApplication::StartAirplayServer()
1589 1589
         txt.push_back(std::make_pair("deviceid", "FF:FF:FF:FF:FF:F2"));
1590 1590
       }
1591 1591
       txt.push_back(std::make_pair("features", "0x77"));
1592  
-      txt.push_back(std::make_pair("model", "AppleTV2,1"));
  1592
+      txt.push_back(std::make_pair("model", "Xbmc,1"));
1593 1593
       txt.push_back(std::make_pair("srcvers", AIRPLAY_SERVER_VERSION_STR));
1594 1594
       CZeroconf::GetInstance()->PublishService("servers.airplay", "_airplay._tcp", g_infoManager.GetLabel(SYSTEM_FRIENDLY_NAME), listenPort, txt);
1595 1595
       ret = true;
2  xbmc/network/AirPlayServer.cpp
@@ -119,7 +119,7 @@ const char *eventStrings[] = {"playing", "paused", "loading", "stopped"};
119 119
 "<key>features</key>\r\n"\
120 120
 "<integer>119</integer>\r\n"\
121 121
 "<key>model</key>\r\n"\
122  
-"<string>AppleTV2,1</string>\r\n"\
  122
+"<string>Xbmc,1</string>\r\n"\
123 123
 "<key>protovers</key>\r\n"\
124 124
 "<string>1.0</string>\r\n"\
125 125
 "<key>srcvers</key>\r\n"\
1  xbmc/network/AirTunesServer.cpp
@@ -524,6 +524,7 @@ bool CAirTunesServer::StartServer(int port, bool nonlocal, bool usePassword, con
524 524
     txt.push_back(std::make_pair("da",  "true"));
525 525
     txt.push_back(std::make_pair("vs",  "130.14"));
526 526
     txt.push_back(std::make_pair("md",  "0,1,2"));
  527
+    txt.push_back(std::make_pair("am",  "Xbmc,1"));
527 528
 
528 529
     CZeroconf::GetInstance()->PublishService("servers.airtunes", "_raop._tcp", appName, port, txt);
529 530
   }

2 notes on commit 77ede9a

Memphiz
Owner

Confirmed that it also fixes airplay from ios 6.1.x clients. Added to backports.

Glenn Aaldering

Confirmed that this patch fixed playing audio via AirPlay on the iPad 3 running iOS6.1.2, the MacBook Air running OSX 10.7.5 and the MacBook Pro Retina running OSX 10.8.2

I did have to disable the Wi-Fi IPv6 support through console (networksetup -setv6off Wi-Fi) on the laptops because they were getting connect errors with IPv6.

The only issue im still having is that I am not able to set my system audio output to XBMC on OSX 10.7.5 while this is working perfectly on OSX 10.8.2

Thanks!

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