From e1d8053389c196921001ec8c9f82ad3cfbd6b246 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Sat, 8 Aug 2020 16:57:55 +0800 Subject: [PATCH] bugfix --- kivyblocks/blocks.py | 1 + kivyblocks/newvideo.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/kivyblocks/blocks.py b/kivyblocks/blocks.py index 0805f8a..4423489 100755 --- a/kivyblocks/blocks.py +++ b/kivyblocks/blocks.py @@ -29,6 +29,7 @@ from .vplayer import VPlayer from .form import InputBox, Form, StrSearchForm from .boxViewer import BoxViewer from .tree import Tree, TextTree +from .newvideo import Video def showError(e): print('error',e) diff --git a/kivyblocks/newvideo.py b/kivyblocks/newvideo.py index fe3cb21..2a49ab2 100644 --- a/kivyblocks/newvideo.py +++ b/kivyblocks/newvideo.py @@ -1,7 +1,10 @@ from kivy.uix.video import Video from kivy.logger import Logger -from kivy.core.window improt Window +from kivy.core.window import Window from kivy.utils import platform +from kivy.factory import Factory +from kivy.properties import BooleanProperty + from ffpyplayer.tools import set_log_callback desktopOSs=[ "win", @@ -22,17 +25,24 @@ class NewVideo(Video): _fullscreen_state = False def __init__(self,**kw): + super(NewVideo, self).__init__(**kw) Window.allow_screensaver = False set_log_callback(self.ffplayerLog) if hasattr(self._video, '_ffplayer'): self.ffplayer = self._video._ffplayer + Window.bind(on_rotate=self.ctrl_fullscreen) + + def ctrl_fullscreen(self,*args): + if Window.width > Window.height: + self.fullscreen = True + else: + self.fullscreen = False + def ffplayerLog(self, msg, level): msg = msg.strip() if msg: logger_func[level]('yffpyplayer: {}'.format(msg)) - if level == 'error' and self.source in msg: - self.dispatch('on_source_error',self,self.source) def audioswitch(self,btn=None): x = self._video._ffplayer.request_channel('audio')