Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frodo airplayconflicts #2582

Merged
merged 2 commits into from
Apr 10, 2013
Merged

Frodo airplayconflicts #2582

merged 2 commits into from
Apr 10, 2013

Conversation

Memphiz
Copy link
Member

@Memphiz Memphiz commented Apr 9, 2013

fixed the conflicts and merged:

Commit:b93a152 - [airplay] - handle empty session ids from itunes
Commit:7f0b5c6 - [airplay] - refactor the playstate announcement by using the IAnnouncer interface

…er interface

- also adapt to some new findings on revers engineering itunes airplay traffic (add sessioncounter to reverse event and fix http request formatting)
- fixes xbmc#14191

Conflicts:

	xbmc/network/AirPlayServer.cpp
@Memphiz
Copy link
Member Author

Memphiz commented Apr 10, 2013

didn't realise that those are not seperated PRs. This one is a backport to Frodo branch.

@ghost ghost assigned davilla Apr 10, 2013
davilla added a commit that referenced this pull request Apr 10, 2013
@davilla davilla merged commit b873637 into xbmc:Frodo Apr 10, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants