Move common code out of platform/darwin/ios #52
Comments
|
This can all be staged prior to ATV, so all the IOS work is done, and then a followup PR for the atv stuff |
|
Fairly large differences for EAGLView. between the platforms, so leave them separate. Have renamed MAINEAGLView.* to TVOSEAGLView.* inline with the ios counterpart |
|
XBMCDebugHelpers.h has been removed. Identical to the NSDebugHelpers.h in platform/darwin |
|
Good idea to use the ios-common folder for common code between iOS and tvOS. So what's the plan?
Is it the right way? |
|
Yeah, i think all the existing ios PR's would be preferred to get in, then we can rebase after. Theres no real rush to get the ATV stuff in, as its only start of v19 build window, so probably best to just polish everything up and rock solid before going into master with 4. i think thatd be best. As IOS is an existing platform, anything changing that is probably best in unrelated pr's than tvos for easy git blame/history
|
|
Ok ;-) For the PR at point 4. it's better to wait until 1., 2. and 3. to be merged isn't it? |
|
Ive got a branch that has commits for build system and darwin_embedded, and a commit for the xbmc codebase ifdeffery the build works without any issues, but running kodi on the ATV crashes, and i havent had time to look at it. Feel free to look over the commits, and comment on anything you think should be changed. |
|
Di you mean for PR number 4? |
|
yeah, i can adopt what i have to not include the tvos stuff. The outline is there which makes it pretty quick and easy |
|
merged: xbmc#16018 I believe that covers all of the platform/darwin/ios code. |
|
nice work! I also agree with the outlined plan. |
|
@fuzzard, Tools and dependencies OK. |
|
Cheers , I'll look at it this afternoon. I think I know what may be causing it |
|
Yes I think I know too. set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/${CORE_SYSTEM_NAME}/XBMCApplication.mm)to set(CORE_MAIN_SOURCE ${CMAKE_SOURCE_DIR}/xbmc/platform/darwin/${CORE_PLATFORM_NAME}/XBMCApplication.mm)It seems working on my side. I will try to build the code project now ;-) |
|
Issue: In Xcode, Edit: Fixed Edit2: I opened a little PR if you want to check the fix that I found fuzzard#2 |
|
have had a quick look at my code. Ill have a look at those fixes this afternoon Sylvain. Already got one of them when i just looked at my code. |
|
So, with the current PR branch (fuzzard#2):
|
|
Sounds like a similar issue to my ATV branch. Something is missing, so I'll have to spend a bit of time trawling through it. |
|
I don't have my iPhone USB cable ATM to directly run Kodi from Xcode (this why I installed the deb remotely from SSH in Wi-Fi). |
|
I just tried directly to run Kodi from Xcode:
|
|
doesnt even look like a crash. It literally just shuts down. odd. |
|
I think this is the reason, based on the log: CFileCache::Open - opening <addons/matrix/addons.xml.gz> using cache |
|
Yes! |
|
This is the log with master branch to compare: https://hastebin.com/ogeguxahel.php Edit: |
|
@fuzzard Just fixed the crash issue with this commit fuzzard@12214fd |
|
ive put in the fixes, just going to get Pogar to do a build/test to confirm, and if it works as hoped, ill submit PR |
|
Submitted PR. will wait for the feedback for changes. As mentioned, will need updates to the build system of most, if not all addons. If we get the go ahead on that PR, ill start the grunt work this weekend. Should only be build related changes, as we still have/support the code define TARGET_DARWIN_IOS. When tvos comes in however, may need to convert any over to TARGET_DARWIN_EMBEDDED if possible. An exampled change. Ill make a list of all the addons kodi ships with and tick them off as i go. |
|
Addons checked/updated.
|
|
another note for myself xbmc/Application.cpp Line 423-425 #ifdef TARGET_DARWIN_EMBEDDED Will need to change that come tvos |
|
@fuzzard this is correct. Or you want to rename the |
|
Yes, rename, or add a tvos ifdef. As far as I remember, this part hasnt been touched in the ATV code as yet, so it will currently be iOS on the ATV builds. |
Extract common code to platform/darwin/ios-common.
The below has very similar code with only minor changes, and possibly some legacy code that may not be required anymore.
At this point in time i've just ifdeffed any differences between our current MAINKeyboard*.* and IOSKeyboard.*
IOSScreenManager looks to be only used in IOS.
IOSExternalTouchController only IOS
Working branch
https://github.com/fuzzard/xbmc/commits/atv_combine
The text was updated successfully, but these errors were encountered: