(2012-06-07, 23:28)neoflex Wrote: (2012-05-15, 00:58)neoflex Wrote: sorry to tell you you'll have to wait for a bit for the merge with the AudioEngine, this merge isn't so easy.
If someone is willing to help, please submit a pull request!
I made an attempt with xbmc master (frodo alpha 3) and spotyxbmc2, commit 961a7f1646e528f459b503e700078ffca6a3e1ff.
I managed to do a 95% completed merge. XBMC compiles and runs ok on Windows, Linux is not tested but I think it should work.
I made the necessary changes to Codec.h and Codec.cpp for AudioEngine. That stuff now works so spotify can play music.
Create a git branch with current xbmc master, at the time when I write this, it is commit: 29465212db4ab0993e088e843cb815a7d6e1bb6c
Then perform the following command:
git apply spotyxbmc2_merge_xbmc_master_2012-07-15.patch
The patch can be downloaded here:
Update: Because the merge is now 100% done, I removed the link.
Work that still needs to be done to complete this merge (but I lack the skills):
It is only one file that I did not merge. If someone wants to help, this file needs to be "spotifyed"
xbmc/interfaces/json-rpc/AudioLibrary.cpp
and then pull request 33 and 34 can be manually applied to update spotyxbmc2 to latest release.
So in summary, except for webinterface and json-rpc the merge is done.