Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[addons] change behaviour of system.platform.osx and add system.platform.darwin #970

Merged
merged 1 commit into from

5 participants

Memphiz Garrett Brown jmarshallnz davilla Tristan Fischer
Memphiz
Owner

This changes the behaviour of the condition system.platform.osx.

Before it was true whenever it was one of ios or osx. Now its only true on osx anymore. For getting the old behaviour system.platform.darwin has to be used after this PR.

So basically we have:

system.platform.darwin - true on ios and osx
system.platform.osx - true on osx
system.platform.ios - true on ios

Hey we can delete a "TODO" comment from code - how cool :)

Memphiz Memphiz [addons] - change system.platform.osx means osx only, system.platform…
….ios means ios only, system.platform.darwin means osx or ios
2594331
Garrett Brown
Collaborator

deleting a TODO is possible? hm, you learn something new everyday

jmarshallnz
Owner

It would pay to comment about this in the skinning development forum - there's a thread there regarding frodo changes. We'll also need a bump for xbmc.gui.skin when this goes in (end of June window).

Memphiz
Owner

done ... but it also is valid for other addons - not only skins. How to communicate that?

davilla
Collaborator

at one time, there was a request to be able to tell an atv2/3 from a iphone/ipad.

that's why there was an system.platform.atv2

Memphiz
Owner

yeah and its still there and it has to stay :)

so system.platform.ios will go true on ios and atv2
system.platform.atv2 will go true on atv2 only ...

but imho thats offtopic ;)

Memphiz
Owner

Is there anything speaking against this change? Else i would like to queue this one up for the june milestone...

Tristan Fischer

Not sure that I got it right but I don't need to change something in the "XBMC Log Uploader" Addon, right?
https://github.com/dersphere/script.xbmc.debug.log/blob/master/addon.py#L117 L117-L126

Sorry, I have no OSX device to test with.

Memphiz Memphiz was assigned
Memphiz
Owner

Nope you are fine. Actually the script starts to put the logs in the right directory on ios with this PR. Before it used the osx path ;)

Memphiz Memphiz merged commit cb4aaaa into from
Kib kib referenced this pull request in mazkolain/spotimc
Open

Support for Apple TV 2 #56

Tobias Hieta tru referenced this pull request from a commit in plexinc/plex-home-theater-public
Tobias Hieta tru Follow providers in search results.
Fixes #970
9bbc506
Memphiz Memphiz deleted the branch
Dale Hamel dalehamel referenced this pull request from a commit in RasPlex/plex-home-theatre
Tobias Hieta tru Follow providers in search results.
Fixes #970
038dd8e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 16, 2012
  1. Memphiz

    [addons] - change system.platform.osx means osx only, system.platform…

    Memphiz authored
    ….ios means ios only, system.platform.darwin means osx or ios
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 4 deletions.
  1. +2 −3 xbmc/GUIInfoManager.cpp
  2. +1 −1  xbmc/GUIInfoManager.h
5 xbmc/GUIInfoManager.cpp
View
@@ -1010,7 +1010,7 @@ int CGUIInfoManager::TranslateSingleString(const CStdString &strCondition)
CStdString platform = info[2].name;
if (platform == "linux") return SYSTEM_PLATFORM_LINUX;
else if (platform == "windows") return SYSTEM_PLATFORM_WINDOWS;
- else if (platform == "osx") return SYSTEM_PLATFORM_OSX;
+ else if (platform == "darwin") return SYSTEM_PLATFORM_DARWIN;
else if (platform == "osx") return SYSTEM_PLATFORM_DARWIN_OSX;
else if (platform == "ios") return SYSTEM_PLATFORM_DARWIN_IOS;
else if (platform == "atv2") return SYSTEM_PLATFORM_DARWIN_ATV2;
@@ -1891,8 +1891,7 @@ bool CGUIInfoManager::GetBool(int condition1, int contextWindow, const CGUIListI
#else
bReturn = false;
#endif
- else if (condition == SYSTEM_PLATFORM_OSX)
- // TODO: rename SYSTEM_PLATFORM_OSX to SYSTEM_PLATFORM_DARWIN after eden release.
+ else if (condition == SYSTEM_PLATFORM_DARWIN)
#ifdef TARGET_DARWIN
bReturn = true;
#else
2  xbmc/GUIInfoManager.h
View
@@ -386,7 +386,7 @@ namespace INFO
#define SYSTEM_PLATFORM_XBOX 740
#define SYSTEM_PLATFORM_LINUX 741
#define SYSTEM_PLATFORM_WINDOWS 742
-#define SYSTEM_PLATFORM_OSX 743
+#define SYSTEM_PLATFORM_DARWIN 743
#define SYSTEM_PLATFORM_DARWIN_OSX 744
#define SYSTEM_PLATFORM_DARWIN_IOS 745
#define SYSTEM_PLATFORM_DARWIN_ATV2 746
Something went wrong with that request. Please try again.