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

[UPnP] Upgrade Platinum #1230

Merged
merged 9 commits into from
Sep 5, 2012
Merged

[UPnP] Upgrade Platinum #1230

merged 9 commits into from
Sep 5, 2012

Conversation

alcoheca
Copy link
Contributor

This upgrades Platinum to 0.6.9.1, reinstates any changes still needed that elupus made since the last upgrade, and cleans up a tiny bit of the xbmc code since some handling was simplified.

I don't have xcode or visual studio so those builds will need fixed too - sorry!

@Memphiz
Copy link
Member

Memphiz commented Aug 3, 2012

Ok i have adapted osx and ios xcode projects for a quick test. I can confirm that (once the xcode projects are synced) this compiles and works (tested a movie, a picture and a mp3) on osx and ios against my ushare server. Once you are ready to pull this, ping me and i will take care of the xcode sync.

@alcoheca
Copy link
Contributor Author

second attempt - all the build changes/class changes are squashed into 458dd72. I've tried to take all comments into consideration. Have ditched the changes to stack handling, and allowing non-MS clients to search.

@wsoltys
Copy link

wsoltys commented Aug 26, 2012

Do you still need help on the win side or did you receive the vs project files already?

@alcoheca
Copy link
Contributor Author

hi yeah if you could fix the win build that would be great - it should just
be a matter of including the correct files.

On 26 August 2012 21:02, wsoltys [email protected] wrote:

Do you still need help on the win side or did you receive the vs project
files already?


Reply to this email directly or view it on GitHubhttps://github.com//pull/1230#issuecomment-8036469.

@wsoltys
Copy link

wsoltys commented Aug 27, 2012

You can find the fixes for the windows platform here: https://github.com/wsoltys/xbmc/commits/upgrade-platinum

@pieh
Copy link
Contributor

pieh commented Sep 2, 2012

@alcoheca
serving non-local file has still same problem for me as I commented earlier on irc - https://github.com/alcoheca/xbmc/blob/upgrade-platinum/lib/libUPnP/Neptune/Source/System/Posix/NptPosixFile.cpp#L240 NPT_stat (that essentially will call _wstat64) doesn't understand paths like "smb://host/share/file" and return error and so eventually it won't serve file. I workarounded it by doing early success return before doing stat there and it works for me, but surely we should call stat from xbmc's IFile there?

@elupus
Copy link
Contributor

elupus commented Sep 2, 2012

Right, should just hook up to vfs. NptXbmcFile.cpp just need to be extended
and the generic dropped.

@alcoheca
Copy link
Contributor Author

alcoheca commented Sep 4, 2012

@pieh have fixed the issue in d0c8f88 - thanks for spotting it.

@alcoheca
Copy link
Contributor Author

alcoheca commented Sep 5, 2012

What's the feelings on getting this merged then? Any show-stoppers?

@ghost
Copy link

ghost commented Sep 5, 2012

is the no serving from remote a regression?

@alcoheca
Copy link
Contributor Author

alcoheca commented Sep 5, 2012

fixed after doing stats via NPT_XbmcFile

On 5 September 2012 13:22, Arne Morten Kvarving [email protected]:

is the no serving from remote a regression?


Reply to this email directly or view it on GitHubhttps://github.com//pull/1230#issuecomment-8296134.

@elupus
Copy link
Contributor

elupus commented Sep 5, 2012

Push the green button :-)

@Memphiz
Copy link
Member

Memphiz commented Sep 5, 2012

Better make sure via IRC that someone is around for fixing the xcode projects - similar like here:

https://github.com/Memphiz/xbmc/commits/upgrade-platinum

@alcoheca
Copy link
Contributor Author

alcoheca commented Sep 5, 2012

I had merged @elupus 's xcode changes, but they need resynced to drop lib/libUPnP/Neptune/Source/System/Posix/NptPosixFile.cpp

also need xcode changes for code-shuffle branch presuming that can go in - it's fairly benign

WIN32 needs another round of changes for both branches and a pull request if possible. @wsoltys

…browse req' by elupus @ cb110ea

all other modifications to libPlatinum/Neptune since codiqs last commit have
been checked and are not required / have been included upstream

the following patches therefore do not need to be reinstated:

5e5156b
4df0a4c
a6eaa58
964b08a
2f70d12
299d326
5bbf59f
370c836
755f17f
20c1ed6
0b11444
f96d966
99479c3
347aa55
a1993bf
f13f20a
95df1d0
887728b
66d2daf
ec70e26
296435b
99e0a1e
588a66a
3fd2548
…erving files from vfs was broken. Solution is to remove all filesystem access to Platinum and expand NPT_XbmcFile. Anything apart from GetInfo:: (stat) is ignored as Platinum only serves up library items, not file systems. Thanks to elupus for fix, and pieh for spotting this in the first place
@alcoheca
Copy link
Contributor Author

alcoheca commented Sep 5, 2012

Actually I've got the Xcode and Visual studio changes in fine, including the ones after the VFS fix. Focus on code-shuffle instead please.. :)

this is good to go in, so hitting green after holding my breath for 10 seconds

alcoheca added a commit that referenced this pull request Sep 5, 2012
@alcoheca alcoheca merged commit 8de938a into xbmc:master Sep 5, 2012
@Memphiz
Copy link
Member

Memphiz commented Sep 5, 2012

@elupus any reas on why you added SystemConfiguration.framework to the osx xcode project? Its red on my 10.6.8 installation (means not there) - and doesn't seem to be used.

Beside that - are you able to sync XBMC-IOS and XBMC-ATV2 xcode projects aswell?

@Memphiz
Copy link
Member

Memphiz commented Sep 5, 2012

mhh nvm already on it...

@elupus
Copy link
Contributor

elupus commented Sep 5, 2012

@Memphiz it was used to get hostname of system. I suppose it could have been handled differently.

@elupus
Copy link
Contributor

elupus commented Sep 5, 2012

@Memphiz no i don't think i did sync those. are they not part of the main project?

@Memphiz
Copy link
Member

Memphiz commented Sep 5, 2012

No see XBMC-IOS.xcodeproj and XBMC-ATV2.xcodeproj. IOS done - now ATV2 :)

@alcoheca
Copy link
Contributor Author

alcoheca commented Sep 5, 2012

thanks @Memphiz

On 5 September 2012 19:17, Memphiz [email protected] wrote:

No see XBMC-IOS.xcodeproj and XBMC-ATV2.xcodeproj. IOS done - now ATV2 :)


Reply to this email directly or view it on GitHubhttps://github.com//pull/1230#issuecomment-8308332.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Feature non-breaking change which adds functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants