Fix: space shortcut is invalid when the focus is outside the video view

xfangfang · Mar 11, 2024 · 7a97cd5 · 7a97cd5
1 parent 8c1a9ac
commit 7a97cd5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/library/borealis b/library/borealis
diff --git a/wiliwili/include/view/video_view.hpp b/wiliwili/include/view/video_view.hpp
@@ -143,7 +143,7 @@ class VideoView : public brls::Box {
     // 3. 全屏时 osd 显示状态下按返回键隐藏 osd，隐藏后再按返回键退出全屏。（之前：返回键控制直接退出全屏）
     void setTvControlMode(bool state);
 
-    bool getTvControlMode();
+    bool getTvControlMode() const;
 
     /// 设置播放时间 (左下角: 00:00:00/00:00:00 中左侧的值)
     void setStatusLabelLeft(const std::string& value);

diff --git a/wiliwili/source/activity/player_base_activity.cpp b/wiliwili/source/activity/player_base_activity.cpp
@@ -252,6 +252,12 @@ void BasePlayerActivity::setCommonData() {
                              return true;
                          });
 
+    // 暂停
+    this->registerAction("toggle", brls::ControllerButton::BUTTON_SPACE, [this](...) -> bool {
+        this->video->togglePlay();
+        return true;
+    }, true);
+
     this->btnQR->getParent()->addGestureRecognizer(new brls::TapGestureRecognizer(this->btnQR->getParent()));
 
     this->btnAgree->getParent()->addGestureRecognizer(new brls::TapGestureRecognizer(this->btnAgree->getParent()));

diff --git a/wiliwili/source/view/mpv_core.cpp b/wiliwili/source/view/mpv_core.cpp
@@ -358,9 +358,9 @@ void MPVCore::init() {
     // mpvSetOptionString(mpv, "msg-level", "all=no");
     if (MPVCore::TERMINAL) {
         mpvSetOptionString(mpv, "terminal", "yes");
-#ifdef _DEBUG
-        mpvSetOptionString(mpv, "msg-level", "all=v");
-#endif
+        if ( brls::Logger::getLogLevel() >= brls::LogLevel::LOG_DEBUG ) {
+            mpvSetOptionString(mpv, "msg-level", "all=v");
+        }
     }
 
     if (mpvInitialize(mpv) < 0) {

diff --git a/wiliwili/source/view/video_view.cpp b/wiliwili/source/view/video_view.cpp
@@ -139,6 +139,7 @@ VideoView::VideoView() {
 
     // 暂停
     this->registerAction("toggle", brls::ControllerButton::BUTTON_SPACE, [this](...) -> bool {
+        CHECK_OSD(true);
         this->togglePlay();
         return true;
     }, true);
@@ -1029,7 +1030,7 @@ void VideoView::setTvControlMode(bool state) {
     _setTvControlMode(isTvControlMode && !isLiveMode);
 }
 
-bool VideoView::getTvControlMode() { return isTvControlMode; }
+bool VideoView::getTvControlMode() const { return isTvControlMode; }
 
 void VideoView::_setTvControlMode(bool state) {
     btnToggle->setCustomNavigationRoute(brls::FocusDirection::RIGHT, state ? osdSlider : iconBox);
+3 −1		library/include/borealis/core/box.hpp
+8 −0		library/include/borealis/core/logger.hpp
+11 −3		library/lib/core/box.cpp
+5 −0		library/lib/core/logger.cpp