SettingActivity: Support Limit FPS

xfangfang · Jul 10, 2023 · 6b430fa · 6b430fa
1 parent 930cf13
commit 6b430fa
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 1 deletion.
diff --git a/resources/i18n/en-US/wiliwili.json b/resources/i18n/en-US/wiliwili.json
@@ -31,6 +31,8 @@
  "vibration": "Gamepad vibration",
  "hide_bottom": "Hide the hint bar below",
  "hide_fps": "Hide FPS",
+ "limited_fps": "Maximum frame limit",
+ "limited_fps_vsync": "Vertical Synchronization",
  "fullscreen": "Fullscreen",
  "tv_search": "TV style search page",
  "theme": {

diff --git a/resources/i18n/zh-Hans/wiliwili.json b/resources/i18n/zh-Hans/wiliwili.json
@@ -31,6 +31,8 @@
  "vibration": "手柄振动",
  "hide_bottom": "隐藏下方提示栏",
  "hide_fps": "隐藏 FPS",
+ "limited_fps": "最高帧数限制",
+ "limited_fps_vsync": "垂直同步",
  "fullscreen": "全屏显示",
  "tv_search": "电视风格搜索页",
  "theme": {

diff --git a/resources/i18n/zh-Hant/wiliwili.json b/resources/i18n/zh-Hant/wiliwili.json
@@ -31,6 +31,8 @@
  "vibration": "手柄振動",
  "hide_bottom": "隱藏下方提示欄",
  "hide_fps": "隱藏 FPS",
+ "limited_fps": "最高幀數限制",
+ "limited_fps_vsync": "垂直同步",
  "fullscreen": "全荧幕顯示",
  "tv_search": "電視風格搜尋頁",
  "theme": {

diff --git a/resources/xml/activity/setting_activity.xml b/resources/xml/activity/setting_activity.xml
@@ -109,6 +109,9 @@
  <brls:BooleanCell
  id="setting/opencc"/>
 
+ <SelectorCell
+ id="setting/fps"/>
+
  <SelectorCell
  id="setting/keymap"/>
 

diff --git a/scripts/ios/iOSBundleInfo.plist.in b/scripts/ios/iOSBundleInfo.plist.in
@@ -55,5 +55,7 @@
  <string>development</string>
  <key>com.apple.developer.networking.multicast</key>
  <true/>
+ <key>CADisableMinimumFrameDurationOnPhone</key>
+ <true/>
 </dict>
 </plist>
diff --git a/wiliwili/include/activity/setting_activity.hpp b/wiliwili/include/activity/setting_activity.hpp
@@ -44,6 +44,7 @@ class SettingActivity : public brls::Activity {
  BRLS_BIND(SelectorCell, selectorFormat, "setting/video/format");
  BRLS_BIND(SelectorCell, selectorCodec, "setting/video/codec");
  BRLS_BIND(SelectorCell, selectorQuality, "setting/audio/quality");
+ BRLS_BIND(SelectorCell, selectorFPS, "setting/fps");
  BRLS_BIND(TextBox, labelOpensource, "setting/label/opensource");
  BRLS_BIND(brls::BooleanCell, cellHideBar, "cell/hideBottomBar");
  BRLS_BIND(brls::BooleanCell, cellHideFPS, "cell/hideFPS");

diff --git a/wiliwili/source/activity/setting_activity.cpp b/wiliwili/source/activity/setting_activity.cpp
@@ -246,6 +246,22 @@ void SettingActivity::onContentAvailable() {
  brls::Application::setFPSStatus(!value);
  });
 
+ /// Limited FPS
+ auto fpsOption = conf.getOptionData(SettingItem::LIMITED_FPS);
+ selectorFPS->init(
+ "wiliwili/setting/app/others/limited_fps"_i18n,
+ {"wiliwili/setting/app/others/limited_fps_vsync"_i18n,
+ "30",
+ "60",
+ "90",
+ "120"},
+ (size_t)conf.getIntOptionIndex(SettingItem::LIMITED_FPS), [fpsOption](int data) {
+ int fps = fpsOption.rawOptionList[data];
+ brls::Application::setLimitedFPS(fps);
+ ProgramConfig::instance().setSettingItem(SettingItem::LIMITED_FPS, fps);
+ return true;
+ });
+
  /// TV Search Mode
  cellTvSearch->init("wiliwili/setting/app/others/tv_search"_i18n,
  conf.getBoolOption(SettingItem::SEARCH_TV_MODE),

diff --git a/wiliwili/source/utils/config_helper.cpp b/wiliwili/source/utils/config_helper.cpp
@@ -153,7 +153,7 @@ std::unordered_map<SettingItem, ProgramOption> ProgramConfig::SETTING_MAP = {
  {"0.5", "0.75", "1.0", "1.25", "1.5"},
  {150, 125, 100, 75, 50},
  2}},
- {SettingItem::LIMITED_FPS, {"limited_fps", {}, {}, 0}},
+ {SettingItem::LIMITED_FPS, {"limited_fps", {"0","30","60","90","120"}, {0,30,60,90,120}, 0}},
  {SettingItem::DEACTIVATED_TIME, {"deactivated_time", {}, {}, 0}},
  {SettingItem::DEACTIVATED_FPS, {"deactivated_fps", {}, {}, 0}},
 };