From 471699a82f84a386f528900cae3afed5c28a87c6 Mon Sep 17 00:00:00 2001 From: grimhilt Date: Sat, 2 Sep 2023 15:23:10 +0200 Subject: [PATCH] not push --- requirements.txt | 18 ++++++++---------- src/screen/SlideShow.py | 10 +++++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3533562..52c4fa7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,9 @@ -pandas==2.0.3 -requests==2.31.0 -tkinter==3.11.4 -mpv==1.0.4 -Pillow==10.0.0 -opencv-python==4.8.0.76 -Flask==2.3.3 -Flask-SQLAlchemy==3.0.5 +pandas==1.5.3 +requests==2.29.0 +mpv==1.0.3 +Pillow==9.4.0 +Flask==2.2.5 +Flask-SQLAlchemy==3.0.3 Flask-Login==0.6.2 -Flask-Cors==4.0.0 -imageio==2.31.2 +Flask-Cors==3.0.10 +imageio==2.28.1 diff --git a/src/screen/SlideShow.py b/src/screen/SlideShow.py index b5e564b..423ac34 100644 --- a/src/screen/SlideShow.py +++ b/src/screen/SlideShow.py @@ -1,5 +1,5 @@ import tkinter as tk -import cv2 +#import cv2 from PIL import Image, ImageTk, Image from tkvideo import tkvideo import time @@ -85,10 +85,10 @@ class VideoPlayer: player.wait_for_playback() player.metadata - self.cap = cv2.VideoCapture(self.path) + #self.cap = cv2.VideoCapture(self.path) - self.total_frames = int(self.cap.get(cv2.CAP_PROP_FRAME_COUNT)) - self.fps = int(self.cap.get(cv2.CAP_PROP_FPS)) - self.time = int(self.total_frames * ((int(1000/self.fps)))) + #self.total_frames = int(self.cap.get(cv2.CAP_PROP_FRAME_COUNT)) + #self.fps = int(self.cap.get(cv2.CAP_PROP_FPS)) + #self.time = int(self.total_frames * ((int(1000/self.fps)))) self.mpv_instance.play(self.path)