From 40e7ce816a463f1b14ee2d2710329cca994ca043 Mon Sep 17 00:00:00 2001 From: Madhura Jayaraman Date: Thu, 8 Aug 2024 10:09:45 -0700 Subject: [PATCH] Remove SbSystemGetDeviceType (#3895) b/355449840 --- cobalt/browser/application.cc | 7 --- cobalt/browser/user_agent_platform_info.cc | 52 ------------------- cobalt/browser/user_agent_platform_info.h | 11 ---- .../testing/mock_user_agent_platform_info.h | 5 -- cobalt/web/user_agent_platform_info.h | 3 -- starboard/android/shared/BUILD.gn | 1 - .../android/shared/system_get_device_type.cc | 23 -------- starboard/elf_loader/exported_symbols.cc | 3 -- starboard/linux/shared/BUILD.gn | 1 - .../linux/shared/system_get_device_type.cc | 23 -------- starboard/nplb/system_get_property_test.cc | 28 ---------- starboard/raspi/shared/BUILD.gn | 1 - .../raspi/shared/system_get_device_type.cc | 23 -------- .../shared/stub/system_get_device_type.cc | 23 -------- starboard/shared/uwp/application_uwp.cc | 6 --- .../shared/uwp/player_components_factory.cc | 7 --- .../shared/uwp/system_get_device_type.cc | 42 --------------- .../shared/win32/system_get_device_type.cc | 28 ---------- starboard/stub/BUILD.gn | 1 - starboard/system.h | 42 --------------- starboard/win/win32/BUILD.gn | 1 - starboard/xb1/BUILD.gn | 1 - 22 files changed, 332 deletions(-) delete mode 100644 starboard/android/shared/system_get_device_type.cc delete mode 100644 starboard/linux/shared/system_get_device_type.cc delete mode 100644 starboard/raspi/shared/system_get_device_type.cc delete mode 100644 starboard/shared/stub/system_get_device_type.cc delete mode 100644 starboard/shared/uwp/system_get_device_type.cc delete mode 100644 starboard/shared/win32/system_get_device_type.cc diff --git a/cobalt/browser/application.cc b/cobalt/browser/application.cc index 7b852d31905d2..c30f30801cd91 100644 --- a/cobalt/browser/application.cc +++ b/cobalt/browser/application.cc @@ -127,17 +127,10 @@ std::string GetDevServersListenIp() { // Default to INADDR_ANY std::string listen_ip(ip_v6 ? "::" : "0.0.0.0"); -#if SB_API_VERSION < 15 - // Desktop PCs default to loopback. - if (SbSystemGetDeviceType() == kSbSystemDeviceTypeDesktopPC) { - listen_ip = ip_v6 ? "::1" : "127.0.0.1"; - } -#else if (starboard::GetSystemPropertyString(kSbSystemPropertyDeviceType) == starboard::kSystemDeviceTypeDesktopPC) { listen_ip = ip_v6 ? "::1" : "127.0.0.1"; } -#endif #if defined(ENABLE_DEBUG_COMMAND_LINE_SWITCHES) base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); diff --git a/cobalt/browser/user_agent_platform_info.cc b/cobalt/browser/user_agent_platform_info.cc index 380aec7c7ea81..a6563bf9b43d0 100644 --- a/cobalt/browser/user_agent_platform_info.cc +++ b/cobalt/browser/user_agent_platform_info.cc @@ -110,47 +110,6 @@ void GetUserAgentInputMap( namespace { -#if SB_API_VERSION < 15 - -struct DeviceTypeName { - SbSystemDeviceType device_type; - char device_type_string[10]; -}; - -const DeviceTypeName kDeviceTypeStrings[] = { - {kSbSystemDeviceTypeBlueRayDiskPlayer, "BDP"}, - {kSbSystemDeviceTypeGameConsole, "GAME"}, - {kSbSystemDeviceTypeOverTheTopBox, "OTT"}, - {kSbSystemDeviceTypeSetTopBox, "STB"}, - {kSbSystemDeviceTypeTV, "TV"}, - {kSbSystemDeviceTypeAndroidTV, "ATV"}, - {kSbSystemDeviceTypeDesktopPC, "DESKTOP"}, - {kSbSystemDeviceTypeVideoProjector, "PROJECTOR"}, - {kSbSystemDeviceTypeUnknown, "UNKNOWN"}}; - -std::string CreateDeviceTypeString(SbSystemDeviceType device_type) { - for (auto& map : kDeviceTypeStrings) { - if (map.device_type == device_type) { - return std::string(map.device_type_string); - } - } - NOTREACHED(); - return "UNKNOWN"; -} - -#if !defined(COBALT_BUILD_TYPE_GOLD) -SbSystemDeviceType GetDeviceType(std::string device_type_string) { - for (auto& map : kDeviceTypeStrings) { - if (!SbStringCompareNoCase(map.device_type_string, - device_type_string.c_str())) { - return map.device_type; - } - } - return kSbSystemDeviceTypeUnknown; -} -#endif -#endif // SB_API_VERSION < 15 - static bool isAsciiAlphaDigit(int c) { return base::IsAsciiAlpha(c) || base::IsAsciiDigit(c); } @@ -320,15 +279,10 @@ void InitializeUserAgentPlatformInfoFields(UserAgentPlatformInfo& info) { info.set_aux_field(value); } -#if SB_API_VERSION >= 15 result = SbSystemGetProperty(kSbSystemPropertyDeviceType, value, kSystemPropertyMaxLength); SB_DCHECK(result); info.set_device_type(value); -#else - // Fill platform info if it is a hardware TV device. - info.set_device_type(SbSystemGetDeviceType()); -#endif // Chipset model number result = SbSystemGetProperty(kSbSystemPropertyChipsetModelNumber, value, @@ -481,12 +435,6 @@ void UserAgentPlatformInfo::set_original_design_manufacturer( } } -#if SB_API_VERSION < 15 -void UserAgentPlatformInfo::set_device_type(SbSystemDeviceType device_type) { - device_type_ = device_type; - device_type_string_ = CreateDeviceTypeString(device_type_); -} -#endif void UserAgentPlatformInfo::set_device_type(const std::string& device_type) { device_type_string_ = device_type; } diff --git a/cobalt/browser/user_agent_platform_info.h b/cobalt/browser/user_agent_platform_info.h index f9267345dff2d..78a1cc84306ab 100644 --- a/cobalt/browser/user_agent_platform_info.h +++ b/cobalt/browser/user_agent_platform_info.h @@ -43,11 +43,6 @@ class UserAgentPlatformInfo : public web::UserAgentPlatformInfo { base::Optional original_design_manufacturer() const override { return original_design_manufacturer_; } - -#if SB_API_VERSION < 15 - SbSystemDeviceType device_type() const override { return device_type_; } -#endif - const std::string& device_type_string() const override { return device_type_string_; } @@ -101,9 +96,6 @@ class UserAgentPlatformInfo : public web::UserAgentPlatformInfo { void set_os_name_and_version(const std::string& os_name_and_version); void set_original_design_manufacturer( base::Optional original_design_manufacturer); -#if SB_API_VERSION < 15 - void set_device_type(SbSystemDeviceType device_type); -#endif void set_device_type(const std::string& device_type); void set_chipset_model_number( base::Optional chipset_model_number); @@ -132,9 +124,6 @@ class UserAgentPlatformInfo : public web::UserAgentPlatformInfo { std::string starboard_version_; std::string os_name_and_version_; base::Optional original_design_manufacturer_; -#if SB_API_VERSION < 15 - SbSystemDeviceType device_type_ = kSbSystemDeviceTypeUnknown; -#endif std::string device_type_string_; base::Optional chipset_model_number_; base::Optional model_year_; diff --git a/cobalt/web/testing/mock_user_agent_platform_info.h b/cobalt/web/testing/mock_user_agent_platform_info.h index c8eeb2295448c..16b37927a2476 100644 --- a/cobalt/web/testing/mock_user_agent_platform_info.h +++ b/cobalt/web/testing/mock_user_agent_platform_info.h @@ -40,11 +40,6 @@ class MockUserAgentPlatformInfo : public web::UserAgentPlatformInfo { base::Optional original_design_manufacturer() const override { return optional_empty_string_; } -#if SB_API_VERSION < 15 - SbSystemDeviceType device_type() const override { - return kSbSystemDeviceTypeUnknown; - } -#endif const std::string& device_type_string() const override { return empty_string_; } diff --git a/cobalt/web/user_agent_platform_info.h b/cobalt/web/user_agent_platform_info.h index f523addd888d2..e75faa902fa61 100644 --- a/cobalt/web/user_agent_platform_info.h +++ b/cobalt/web/user_agent_platform_info.h @@ -32,9 +32,6 @@ class UserAgentPlatformInfo { virtual const std::string& starboard_version() const = 0; virtual const std::string& os_name_and_version() const = 0; virtual base::Optional original_design_manufacturer() const = 0; -#if SB_API_VERSION < 15 - virtual SbSystemDeviceType device_type() const = 0; -#endif virtual const std::string& device_type_string() const = 0; virtual base::Optional chipset_model_number() const = 0; virtual base::Optional model_year() const = 0; diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn index d7343f02bb342..9a248f25f287b 100644 --- a/starboard/android/shared/BUILD.gn +++ b/starboard/android/shared/BUILD.gn @@ -396,7 +396,6 @@ static_library("starboard_platform") { "speech_synthesis_internal.cc", "speech_synthesis_is_supported.cc", "speech_synthesis_speak.cc", - "system_get_device_type.cc", "system_get_extensions.cc", "system_get_locale_id.cc", "system_get_path.cc", diff --git a/starboard/android/shared/system_get_device_type.cc b/starboard/android/shared/system_get_device_type.cc deleted file mode 100644 index 8c7eb3c0abb86..0000000000000 --- a/starboard/android/shared/system_get_device_type.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeAndroidTV; -} - -#endif diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc index c4ff766704a22..97d5d3d394820 100644 --- a/starboard/elf_loader/exported_symbols.cc +++ b/starboard/elf_loader/exported_symbols.cc @@ -327,9 +327,6 @@ ExportedSymbols::ExportedSymbols() { #endif // SB_API_VERSION < 16 REGISTER_SYMBOL(SbSystemBreakIntoDebugger); REGISTER_SYMBOL(SbSystemClearLastError); -#if SB_API_VERSION < 15 - REGISTER_SYMBOL(SbSystemGetDeviceType); -#endif REGISTER_SYMBOL(SbSystemGetErrorString); REGISTER_SYMBOL(SbSystemGetExtension); REGISTER_SYMBOL(SbSystemGetLastError); diff --git a/starboard/linux/shared/BUILD.gn b/starboard/linux/shared/BUILD.gn index aa55f946d4493..53838e95b4d27 100644 --- a/starboard/linux/shared/BUILD.gn +++ b/starboard/linux/shared/BUILD.gn @@ -86,7 +86,6 @@ static_library("starboard_platform_sources") { "//starboard/linux/shared/routes.h", "//starboard/linux/shared/soft_mic_platform_service.cc", "//starboard/linux/shared/soft_mic_platform_service.h", - "//starboard/linux/shared/system_get_device_type.cc", "//starboard/linux/shared/system_get_extensions.cc", "//starboard/linux/shared/system_get_path.cc", "//starboard/linux/shared/system_has_capability.cc", diff --git a/starboard/linux/shared/system_get_device_type.cc b/starboard/linux/shared/system_get_device_type.cc deleted file mode 100644 index ba90dbc08077d..0000000000000 --- a/starboard/linux/shared/system_get_device_type.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeDesktopPC; -} - -#endif diff --git a/starboard/nplb/system_get_property_test.cc b/starboard/nplb/system_get_property_test.cc index f57e14c647117..e938899db7b16 100644 --- a/starboard/nplb/system_get_property_test.cc +++ b/starboard/nplb/system_get_property_test.cc @@ -28,22 +28,6 @@ namespace { // Size of appropriate value buffer. const size_t kValueSize = 1024; -#if SB_API_VERSION < 15 -bool IsCEDevice(SbSystemDeviceType device_type) { - switch (device_type) { - case kSbSystemDeviceTypeBlueRayDiskPlayer: - case kSbSystemDeviceTypeGameConsole: - case kSbSystemDeviceTypeOverTheTopBox: - case kSbSystemDeviceTypeSetTopBox: - case kSbSystemDeviceTypeTV: - return true; - case kSbSystemDeviceTypeDesktopPC: - case kSbSystemDeviceTypeUnknown: - default: - return false; - } -} -#endif bool IsCEDevice(std::string device_type) { if (device_type == kSystemDeviceTypeBlueRayDiskPlayer || device_type == kSystemDeviceTypeGameConsole || @@ -97,17 +81,6 @@ TEST(SbSystemGetPropertyTest, ReturnsRequired) { BasicTest(kSbSystemPropertyFirmwareVersion, false, true, __LINE__); BasicTest(kSbSystemPropertySystemIntegratorName, false, true, __LINE__); BasicTest(kSbSystemPropertySpeechApiKey, false, true, __LINE__); -#if SB_API_VERSION < 15 - if (IsCEDevice(SbSystemGetDeviceType())) { - BasicTest(kSbSystemPropertyBrandName, true, true, __LINE__); - BasicTest(kSbSystemPropertyModelName, true, true, __LINE__); - BasicTest(kSbSystemPropertyModelYear, false, true, __LINE__); - } else { - BasicTest(kSbSystemPropertyBrandName, false, true, __LINE__); - BasicTest(kSbSystemPropertyModelName, false, true, __LINE__); - BasicTest(kSbSystemPropertyModelYear, false, true, __LINE__); - } -#else const size_t kSystemPropertyMaxLength = 1024; char value[kSystemPropertyMaxLength]; bool result; @@ -122,7 +95,6 @@ TEST(SbSystemGetPropertyTest, ReturnsRequired) { BasicTest(kSbSystemPropertyModelName, false, true, __LINE__); BasicTest(kSbSystemPropertyModelYear, false, true, __LINE__); } -#endif } TEST(SbSystemGetPropertyTest, FailsGracefullyZeroBufferLength) { diff --git a/starboard/raspi/shared/BUILD.gn b/starboard/raspi/shared/BUILD.gn index fcfc835ded38c..9f1da538920e3 100644 --- a/starboard/raspi/shared/BUILD.gn +++ b/starboard/raspi/shared/BUILD.gn @@ -65,7 +65,6 @@ static_library("starboard_platform_sources") { "//starboard/raspi/shared/open_max/video_decoder.cc", "//starboard/raspi/shared/open_max/video_decoder.h", "//starboard/raspi/shared/player_components_factory.cc", - "//starboard/raspi/shared/system_get_device_type.cc", "//starboard/raspi/shared/system_get_property.cc", "//starboard/raspi/shared/system_gles2.cc", "//starboard/raspi/shared/thread_create_priority.cc", diff --git a/starboard/raspi/shared/system_get_device_type.cc b/starboard/raspi/shared/system_get_device_type.cc deleted file mode 100644 index a3e78d207d197..0000000000000 --- a/starboard/raspi/shared/system_get_device_type.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2020 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/stub/system_get_device_type.cc b/starboard/shared/stub/system_get_device_type.cc deleted file mode 100644 index 00ac8d3194a6a..0000000000000 --- a/starboard/shared/stub/system_get_device_type.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/uwp/application_uwp.cc b/starboard/shared/uwp/application_uwp.cc index cfb746796a906..85fa13ad7084c 100644 --- a/starboard/shared/uwp/application_uwp.cc +++ b/starboard/shared/uwp/application_uwp.cc @@ -1328,16 +1328,10 @@ int InternalMain() { #if defined(COBALT_BUILD_TYPE_GOLD) // Early exit for gold builds on desktop as a security measure. -#if SB_API_VERSION < 15 - if (SbSystemGetDeviceType() == kSbSystemDeviceTypeDesktopPC) { - return main_return_value; - } -#else if (GetSystemPropertyString(kSbSystemPropertyDeviceType) == kSystemDeviceTypeDesktopPC) { return main_return_value; } -#endif #endif // defined(COBALT_BUILD_TYPE_GOLD) shared::win32::RegisterMainThread(); diff --git a/starboard/shared/uwp/player_components_factory.cc b/starboard/shared/uwp/player_components_factory.cc index 4ead7137e009e..a02392f66195b 100644 --- a/starboard/shared/uwp/player_components_factory.cc +++ b/starboard/shared/uwp/player_components_factory.cc @@ -219,18 +219,11 @@ class PlayerComponentsFactory : public PlayerComponents::Factory { } #if !SB_HAS(GPU_DECODERS_ON_DESKTOP) -#if SB_API_VERSION < 15 - if (SbSystemGetDeviceType() == kSbSystemDeviceTypeDesktopPC) { - SB_LOG(WARNING) << "GPU decoder disabled on Desktop."; - return false; - } -#else if (GetSystemPropertyString(kSbSystemPropertyDeviceType) == kSystemDeviceTypeDesktopPC) { SB_LOG(WARNING) << "GPU decoder disabled on Desktop."; return false; } -#endif #endif // !SB_HAS(GPU_DECODERS_ON_DESKTOP) if (video_codec != kSbMediaVideoCodecVp9 && video_codec != kSbMediaVideoCodecAv1) { diff --git a/starboard/shared/uwp/system_get_device_type.cc b/starboard/shared/uwp/system_get_device_type.cc deleted file mode 100644 index e1b941b08e16a..0000000000000 --- a/starboard/shared/uwp/system_get_device_type.cc +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright 2017 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#include - -#include "starboard/common/log.h" -#include "starboard/shared/win32/wchar_utils.h" - -using Windows::System::Profile::AnalyticsInfo; -using Windows::System::Profile::AnalyticsVersionInfo; - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - AnalyticsVersionInfo ^ version_info = AnalyticsInfo::VersionInfo; - std::string family = starboard::shared::win32::platformStringToString( - version_info->DeviceFamily); - - if (family.compare("Windows.Desktop") == 0) { - return kSbSystemDeviceTypeDesktopPC; - } - if (family.compare("Windows.Xbox") == 0) { - return kSbSystemDeviceTypeGameConsole; - } - SB_NOTREACHED(); - return kSbSystemDeviceTypeUnknown; -} - -#endif diff --git a/starboard/shared/win32/system_get_device_type.cc b/starboard/shared/win32/system_get_device_type.cc deleted file mode 100644 index 5e5a4647c717d..0000000000000 --- a/starboard/shared/win32/system_get_device_type.cc +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017 The Cobalt Authors. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include "starboard/system.h" - -#include - -#include "starboard/common/log.h" -#include "starboard/shared/win32/wchar_utils.h" - -#if SB_API_VERSION < 15 - -SbSystemDeviceType SbSystemGetDeviceType() { - return kSbSystemDeviceTypeDesktopPC; -} - -#endif diff --git a/starboard/stub/BUILD.gn b/starboard/stub/BUILD.gn index 181951e2346be..0fe618efb038f 100644 --- a/starboard/stub/BUILD.gn +++ b/starboard/stub/BUILD.gn @@ -198,7 +198,6 @@ static_library("stub_sources") { "//starboard/shared/stub/system_break_into_debugger.cc", "//starboard/shared/stub/system_clear_last_error.cc", "//starboard/shared/stub/system_egl.cc", - "//starboard/shared/stub/system_get_device_type.cc", "//starboard/shared/stub/system_get_error_string.cc", "//starboard/shared/stub/system_get_last_error.cc", "//starboard/shared/stub/system_get_locale_id.cc", diff --git a/starboard/system.h b/starboard/system.h index ba1bfb38759fd..5f7802a725e77 100644 --- a/starboard/system.h +++ b/starboard/system.h @@ -125,48 +125,11 @@ typedef enum SbSystemPropertyId { // a true value. Corresponds to 'lmt' field. kSbSystemPropertyLimitAdTracking, -#if SB_API_VERSION >= 15 // Type of the device, e.g. such as "TV", "STB", "OTT" // Please see Youtube Technical requirements for a full list of allowed values kSbSystemPropertyDeviceType, -#endif } SbSystemPropertyId; -#if SB_API_VERSION < 15 -// Enumeration of device types. -typedef enum SbSystemDeviceType { - // Blue-ray Disc Player (BDP). - kSbSystemDeviceTypeBlueRayDiskPlayer, - - // A relatively high-powered TV device used primarily for playing games. - kSbSystemDeviceTypeGameConsole, - - // Over the top (OTT) devices stream content via the Internet over another - // type of network, e.g. cable or satellite. - kSbSystemDeviceTypeOverTheTopBox, - - // Set top boxes (STBs) stream content primarily over cable or satellite. - // Some STBs can also stream OTT content via the Internet. - kSbSystemDeviceTypeSetTopBox, - - // A Smart TV is a TV that can directly run applications that stream OTT - // content via the Internet. - kSbSystemDeviceTypeTV, - - // Desktop PC. - kSbSystemDeviceTypeDesktopPC, - - // An Android TV Device. - kSbSystemDeviceTypeAndroidTV, - - // A wall video projector. - kSbSystemDeviceTypeVideoProjector, - - // Unknown device. - kSbSystemDeviceTypeUnknown, -} SbSystemDeviceType; -#endif // SB_API_VERSION < 15 - // Runtime capabilities are boolean properties of a platform that can't be // determined at compile-time. They may vary from device to device, but they // will not change over the course of a single execution. They often specify @@ -284,11 +247,6 @@ SB_EXPORT int64_t SbSystemGetTotalGPUMemory(); // SbSystemHasCapability(kSbSystemCapabilityCanQueryGPUMemoryStats) is |true|. SB_EXPORT int64_t SbSystemGetUsedGPUMemory(); -#if SB_API_VERSION < 15 -// Returns the type of the device. -SB_EXPORT SbSystemDeviceType SbSystemGetDeviceType(); -#endif - // Returns if the device is disconnected from network. "Disconnected" is chosen // over connected because disconnection can be determined with more certainty // than connection usually. diff --git a/starboard/win/win32/BUILD.gn b/starboard/win/win32/BUILD.gn index 746db846b6341..e782e40c58d28 100644 --- a/starboard/win/win32/BUILD.gn +++ b/starboard/win/win32/BUILD.gn @@ -52,7 +52,6 @@ static_library("starboard_platform") { "//starboard/shared/win32/player_components_factory.cc", "//starboard/shared/win32/playready_license.cc", "//starboard/shared/win32/starboard_main.cc", - "//starboard/shared/win32/system_get_device_type.cc", "//starboard/shared/win32/system_get_extensions.cc", "//starboard/shared/win32/system_get_property.cc", "//starboard/shared/win32/system_get_total_cpu_memory.cc", diff --git a/starboard/xb1/BUILD.gn b/starboard/xb1/BUILD.gn index 80402c9c3a5bc..9cb142af40891 100644 --- a/starboard/xb1/BUILD.gn +++ b/starboard/xb1/BUILD.gn @@ -126,7 +126,6 @@ static_library("starboard_platform") { "//starboard/shared/uwp/media_is_video_supported.cc", "//starboard/shared/uwp/microphone_impl.cc", "//starboard/shared/uwp/player_components_factory.cc", - "//starboard/shared/uwp/system_get_device_type.cc", "//starboard/shared/uwp/system_get_property.cc", "//starboard/shared/uwp/system_get_total_cpu_memory.cc", "//starboard/shared/uwp/system_get_used_cpu_memory.cc",