Posts: 144
Joined: Aug 2010
Reputation:
2
2012-05-23, 20:28
(This post was last modified: 2012-05-23, 20:44 by barberio.)
I seem to be having a few problems getting the OS X build enviroment working again after a recent rebase, so any patches may be some time in coming.
Here's what I think needs to be done,
1) Pass flags to IFiles
1.a) Move CFile's flag definitions to their own header file.
1.b) Have IFile inherit this, create new functions that get and set these.
1.c) Have CFile set its flags onto any created IFile.
2) Create a "This is a media stream" flag.
3) Case the setting of LibCurl options in CurlFile based on this flag.
4) Set this flag for all calls to CFile that are creating file handles for media playback.
The last one might be tricky, and potentially impossible if there are situations where a CFile call is made without context of it it's for playback.
Posts: 144
Joined: Aug 2010
Reputation:
2
2012-05-24, 02:32
(This post was last modified: 2012-05-24, 03:34 by barberio.)
Just noticed that file stream caching is implemented by having CFile create an FileCache containing an IFile that creates a CFile that creates an IFile. The FileCache also sets it's own flags on the CFile it creates.
This complicates things again.
Posts: 11,582
Joined: Feb 2008
Reputation:
84
davilla
Retired-Team-XBMC Developer
Posts: 11,582
The only thing that might change under 10.7/xcode4 is an xcode SDK setting which should have zero problems under a git merge. There will be some untracked files but big deal, ignore them as git will also ignore them.
Nothing under tools/darwin/depends changes either.
Posts: 144
Joined: Aug 2010
Reputation:
2
XCode4 creates various files under XBMC.xcodeproj/project.xcworkspace/ which are not set in .gitignore
Posts: 11,582
Joined: Feb 2008
Reputation:
84
davilla
Retired-Team-XBMC Developer
Posts: 11,582
they are untracked files, ignore them as git will ignore them too. that explains your .gitignore changes, now how about the xcode project ? What's changed in there ?
Posts: 144
Joined: Aug 2010
Reputation:
2
2012-05-24, 15:33
(This post was last modified: 2012-05-24, 15:34 by barberio.)
They were not untracked files. Because git kept trying to push them as a commit. And this is probably derailing the discussion about fixing the LibCurl Low Speed detection bug.
Posts: 11,582
Joined: Feb 2008
Reputation:
84
davilla
Retired-Team-XBMC Developer
Posts: 11,582
macbook1:xbmc-git davilla$ git status
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# XBMC.xcodeproj/project.xcworkspace/
# XBMC.xcodeproj/xcuserdata/
# tools/EventClients/Clients/OSXRemote/XBMCHelper.xcodeproj/project.xcworkspace/
# tools/EventClients/Clients/OSXRemote/XBMCHelper.xcodeproj/xcuserdata/
^^ Untracked
Posts: 144
Joined: Aug 2010
Reputation:
2
This isn't related to the original issue, or passing CFile Flags. I've sent you an email about what files were still being tracked for commits.
Posts: 144
Joined: Aug 2010
Reputation:
2
Looking over dvdplayer.
dvdplayer appears to be creating it's own iFile classes?