boris-behav-obs 9.7.1__tar.gz → 9.7.7__tar.gz

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boris-behav-obs
-Version: 9.7.1
+Version: 9.7.7
 Summary: BORIS - Behavioral Observation Research Interactive Software
 Author-email: Olivier Friard <olivier.friard@unito.it>
 License-Expression: GPL-3.0-only
@@ -44,15 +44,14 @@ BORIS (Behavioral Observation Research Interactive Software)
 
 BORIS is an easy-to-use event logging software for video/audio coding or live observations.
 
-BORIS is a free and open-source software available for GNU/Linux and Windows.
-You can not longer run BORIS natively on MacOS (since v.8). Some alternatives to run the last version of BORIS are available, see [BORIS on MacOS](https://www.boris.unito.it/download_mac).
+BORIS is a free and open-source software available for GNU/Linux, Windows and macOS.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
 <!-- The BO-RIS paper has more than [![BORIS citations counter](https://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications. -->
 
 
-The BORIS paper has more than 2407 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2423 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/README.md

@@ -6,15 +6,14 @@ BORIS (Behavioral Observation Research Interactive Software)
 
 BORIS is an easy-to-use event logging software for video/audio coding or live observations.
 
-BORIS is a free and open-source software available for GNU/Linux and Windows.
-You can not longer run BORIS natively on MacOS (since v.8). Some alternatives to run the last version of BORIS are available, see [BORIS on MacOS](https://www.boris.unito.it/download_mac).
+BORIS is a free and open-source software available for GNU/Linux, Windows and macOS.
 
 It provides also some analysis tools like time budget and some plotting functions.
 
 <!-- The BO-RIS paper has more than [![BORIS citations counter](https://penelope.unito.it/friard/boris_scopus_citations.png) citations](https://www.boris.unito.it/citations) in peer-reviewed scientific publications. -->
 
 
-The BORIS paper has more than 2407 citations in peer-reviewed scientific publications.
+The BORIS paper has more than 2423 citations in peer-reviewed scientific publications.
 
 
 

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/boris/about.py

@@ -40,7 +40,7 @@ def actionAbout_activated(self):
     About dialog
     """
 
-    programs_versions: list = ["MPV media player"]
+    programs_versions: list[str] = ["MPV media player"]
 
     mpv_lib_version, mpv_lib_file_path, mpv_api_version = util.mpv_lib_version()
     programs_versions.append(
@@ -53,13 +53,13 @@ def actionAbout_activated(self):
 
     # ffmpeg
     if self.ffmpeg_bin == "ffmpeg" and sys.platform.startswith("linux"):
-        ffmpeg_true_path = subprocess.getoutput("which ffmpeg")
+        ffmpeg_true_path: str = subprocess.getoutput("which ffmpeg")
     else:
         ffmpeg_true_path = self.ffmpeg_bin
     programs_versions.extend(
         [
             "\nFFmpeg",
-            subprocess.getoutput(f'"{self.ffmpeg_bin}" -version').split("\n")[0],
+            subprocess.getoutput(cmd=f'"{self.ffmpeg_bin}" -version').split(sep="\n")[0],
             f"Path: {ffmpeg_true_path}",
             "https://www.ffmpeg.org",
         ]
@@ -75,11 +75,11 @@ def actionAbout_activated(self):
     programs_versions.extend(["\nPandas", f"version {pd.__version__}", "https://pandas.pydata.org"])
 
     # graphviz
-    gv_result = subprocess.getoutput("dot -V")
+    gv_result = subprocess.getoutput(cmd="dot -V")
 
     programs_versions.extend(["\nGraphViz", gv_result if "graphviz" in gv_result else "not installed", "https://www.graphviz.org/"])
 
-    about_dialog = QMessageBox()
+    about_dialog: QMessageBox = QMessageBox()
     about_dialog.setIconPixmap(QPixmap(":/boris_unito"))
 
     about_dialog.setWindowTitle(f"About {cfg.programName}")

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/boris/add_modifier_ui.py

@@ -3,7 +3,7 @@
 ################################################################################
 ## Form generated from reading UI file 'add_modifier.ui'
 ##
-## Created by: Qt User Interface Compiler version 6.8.0
+## Created by: Qt User Interface Compiler version 6.10.0
 ##
 ## WARNING! All changes made in this file will be lost when recompiling UI file!
 ################################################################################
@@ -24,18 +24,16 @@ class Ui_Dialog(object):
     def setupUi(self, Dialog):
         if not Dialog.objectName():
             Dialog.setObjectName(u"Dialog")
-        Dialog.resize(1088, 654)
-        self.verticalLayout_5 = QVBoxLayout(Dialog)
-        self.verticalLayout_5.setObjectName(u"verticalLayout_5")
+        Dialog.resize(1339, 789)
+        self.verticalLayout_4 = QVBoxLayout(Dialog)
+        self.verticalLayout_4.setObjectName(u"verticalLayout_4")
         self.cb_ask_at_stop = QCheckBox(Dialog)
         self.cb_ask_at_stop.setObjectName(u"cb_ask_at_stop")
 
-        self.verticalLayout_5.addWidget(self.cb_ask_at_stop)
+        self.verticalLayout_4.addWidget(self.cb_ask_at_stop)
 
-        self.verticalLayout_4 = QVBoxLayout()
-        self.verticalLayout_4.setObjectName(u"verticalLayout_4")
-        self.horizontalLayout_5 = QHBoxLayout()
-        self.horizontalLayout_5.setObjectName(u"horizontalLayout_5")
+        self.horizontalLayout_8 = QHBoxLayout()
+        self.horizontalLayout_8.setObjectName(u"horizontalLayout_8")
         self.verticalLayout_2 = QVBoxLayout()
         self.verticalLayout_2.setObjectName(u"verticalLayout_2")
         self.lbModifier = QLabel(Dialog)
@@ -69,7 +67,7 @@ class Ui_Dialog(object):
         self.verticalLayout_2.addItem(self.verticalSpacer)
 
 
-        self.horizontalLayout_5.addLayout(self.verticalLayout_2)
+        self.horizontalLayout_8.addLayout(self.verticalLayout_2)
 
         self.verticalLayout_3 = QVBoxLayout()
         self.verticalLayout_3.setObjectName(u"verticalLayout_3")
@@ -88,7 +86,7 @@ class Ui_Dialog(object):
         self.verticalLayout_3.addItem(self.verticalSpacer_2)
 
 
-        self.horizontalLayout_5.addLayout(self.verticalLayout_3)
+        self.horizontalLayout_8.addLayout(self.verticalLayout_3)
 
         self.verticalLayout = QVBoxLayout()
         self.verticalLayout.setObjectName(u"verticalLayout")
@@ -102,30 +100,42 @@ class Ui_Dialog(object):
 
         self.verticalLayout.addWidget(self.tabWidgetModifiersSets)
 
+        self.horizontalLayout_5 = QHBoxLayout()
+        self.horizontalLayout_5.setObjectName(u"horizontalLayout_5")
         self.lb_name = QLabel(Dialog)
         self.lb_name.setObjectName(u"lb_name")
 
-        self.verticalLayout.addWidget(self.lb_name)
+        self.horizontalLayout_5.addWidget(self.lb_name)
 
         self.le_name = QLineEdit(Dialog)
         self.le_name.setObjectName(u"le_name")
 
-        self.verticalLayout.addWidget(self.le_name)
+        self.horizontalLayout_5.addWidget(self.le_name)
 
+
+        self.verticalLayout.addLayout(self.horizontalLayout_5)
+
+        self.horizontalLayout_6 = QHBoxLayout()
+        self.horizontalLayout_6.setObjectName(u"horizontalLayout_6")
         self.lb_description = QLabel(Dialog)
         self.lb_description.setObjectName(u"lb_description")
 
-        self.verticalLayout.addWidget(self.lb_description)
+        self.horizontalLayout_6.addWidget(self.lb_description)
 
         self.le_description = QLineEdit(Dialog)
         self.le_description.setObjectName(u"le_description")
 
-        self.verticalLayout.addWidget(self.le_description)
+        self.horizontalLayout_6.addWidget(self.le_description)
+
 
+        self.verticalLayout.addLayout(self.horizontalLayout_6)
+
+        self.horizontalLayout_7 = QHBoxLayout()
+        self.horizontalLayout_7.setObjectName(u"horizontalLayout_7")
         self.lbType = QLabel(Dialog)
         self.lbType.setObjectName(u"lbType")
 
-        self.verticalLayout.addWidget(self.lbType)
+        self.horizontalLayout_7.addWidget(self.lbType)
 
         self.cbType = QComboBox(Dialog)
         self.cbType.addItem("")
@@ -134,7 +144,14 @@ class Ui_Dialog(object):
         self.cbType.addItem("")
         self.cbType.setObjectName(u"cbType")
 
-        self.verticalLayout.addWidget(self.cbType)
+        self.horizontalLayout_7.addWidget(self.cbType)
+
+        self.horizontalSpacer_3 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_7.addItem(self.horizontalSpacer_3)
+
+
+        self.verticalLayout.addLayout(self.horizontalLayout_7)
 
         self.lbValues = QLabel(Dialog)
         self.lbValues.setObjectName(u"lbValues")
@@ -198,28 +215,32 @@ class Ui_Dialog(object):
 
         self.horizontalLayout_4 = QHBoxLayout()
         self.horizontalLayout_4.setObjectName(u"horizontalLayout_4")
-
-        self.verticalLayout.addLayout(self.horizontalLayout_4)
-
         self.pb_add_subjects = QPushButton(Dialog)
         self.pb_add_subjects.setObjectName(u"pb_add_subjects")
 
-        self.verticalLayout.addWidget(self.pb_add_subjects)
+        self.horizontalLayout_4.addWidget(self.pb_add_subjects)
 
         self.pb_load_file = QPushButton(Dialog)
         self.pb_load_file.setObjectName(u"pb_load_file")
 
-        self.verticalLayout.addWidget(self.pb_load_file)
+        self.horizontalLayout_4.addWidget(self.pb_load_file)
+
+        self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+
+        self.horizontalLayout_4.addItem(self.horizontalSpacer_2)
+
+
+        self.verticalLayout.addLayout(self.horizontalLayout_4)
 
         self.verticalSpacer_3 = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
 
         self.verticalLayout.addItem(self.verticalSpacer_3)
 
 
-        self.horizontalLayout_5.addLayout(self.verticalLayout)
+        self.horizontalLayout_8.addLayout(self.verticalLayout)
 
 
-        self.verticalLayout_4.addLayout(self.horizontalLayout_5)
+        self.verticalLayout_4.addLayout(self.horizontalLayout_8)
 
         self.horizontalLayout_2 = QHBoxLayout()
         self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
@@ -241,9 +262,6 @@ class Ui_Dialog(object):
         self.verticalLayout_4.addLayout(self.horizontalLayout_2)
 
 
-        self.verticalLayout_5.addLayout(self.verticalLayout_4)
-
-
         self.retranslateUi(Dialog)
 
         self.tabWidgetModifiersSets.setCurrentIndex(-1)
@@ -256,8 +274,8 @@ class Ui_Dialog(object):
         Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"Set modifiers", None))
         self.cb_ask_at_stop.setText(QCoreApplication.translate("Dialog", u"Ask for modifier(s) when behavior stops", None))
         self.lbModifier.setText(QCoreApplication.translate("Dialog", u"Modifier", None))
-        self.lbCode.setText(QCoreApplication.translate("Dialog", u"Key code", None))
-        self.lbCodeHelp.setText(QCoreApplication.translate("Dialog", u"Key code is case sensitive. Type one character or a function key (F1, F2... F12)", None))
+        self.lbCode.setText(QCoreApplication.translate("Dialog", u"Shortcut", None))
+        self.lbCodeHelp.setText(QCoreApplication.translate("Dialog", u"The shortcut is case sensitive. Type one character or a function key (F1, F2... F12)", None))
         self.pbAddModifier.setText(QCoreApplication.translate("Dialog", u"->", None))
         self.pbModifyModifier.setText(QCoreApplication.translate("Dialog", u"<-", None))
         self.lb_name.setText(QCoreApplication.translate("Dialog", u"Set name", None))

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/boris/config.py

@@ -132,6 +132,8 @@ POINT_EVENT_PLOT_COLOR = "black"
 
 CHAR_FORBIDDEN_IN_MODIFIERS = "(|),`~"
 
+FAST_FORWARD_DEFAULT_VALUE: float = 10.0
+
 ADAPT_FAST_JUMP = "adapt_fast_jump"
 ADAPT_FAST_JUMP_DEFAULT = False
 
@@ -419,6 +421,10 @@ MPV_HWDEC_AUTOSAFE = "auto-safe"
 MPV_HWDEC_OPTIONS = (MPV_HWDEC_AUTO, MPV_HWDEC_AUTOSAFE, MPV_HWDEC_NO)
 MPV_HWDEC_DEFAULT_VALUE = MPV_HWDEC_AUTO
 
+# frame step size (disabled)
+# FRAME_STEP_SIZE: str = "frame_step_size"
+# FRAME_STEP_SIZE_DEFAULT_VALUE: int = 1
+
 ANALYSIS_PLUGINS = "analysis_plugins"
 EXCLUDED_PLUGINS = "excluded_plugins"
 PERSONAL_PLUGINS_DIR = "personal_plugins_dir"
@@ -730,6 +736,7 @@ INIT_PARAM = {
     MPV_HWDEC: MPV_HWDEC_DEFAULT_VALUE,
     PROJECT_FILE_INDENTATION: PROJECT_FILE_INDENTATION_DEFAULT_VALUE,
     f"{MEDIA} tw fields": MEDIA_TW_EVENTS_FIELDS_DEFAULT,
+    # FRAME_STEP_SIZE: FRAME_STEP_SIZE_DEFAULT_VALUE,
 }
 
 SDIS_EXT = "sds"

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/boris/config_file.py

@@ -82,11 +82,11 @@ def read(self):
 
         logging.debug(f"time format: {self.timeFormat}")
 
-        self.fast = 10
+        self.fast = cfg.FAST_FORWARD_DEFAULT_VALUE
         try:
-            self.fast = int(settings.value("Time/fast_forward_speed"))
+            self.fast = float(settings.value("Time/fast_forward_speed"))
         except Exception:
-            self.fast = 10
+            self.fast = cfg.FAST_FORWARD_DEFAULT_VALUE
 
         logging.debug(f"Time/fast_forward_speed: {self.fast}")
 

{boris_behav_obs-9.7.1 → boris_behav_obs-9.7.7}/boris/core.py

@@ -41,9 +41,9 @@ from PIL.ImageQt import Image
 import subprocess
 import locale
 import tempfile
+import math
 import time
 import urllib.request
-from typing import Union, Tuple
 from decimal import Decimal as dec
 from decimal import ROUND_DOWN
 import gzip
@@ -54,17 +54,7 @@ import shutil
 
 matplotlib.use("QtAgg")
 
-from PySide6.QtCore import (
-    Qt,
-    QPoint,
-    Signal,
-    QEvent,
-    QDateTime,
-    QUrl,
-    QAbstractTableModel,
-    QElapsedTimer,
-    QSettings,
-)
+from PySide6.QtCore import Qt, QPoint, Signal, QEvent, QDateTime, QUrl, QAbstractTableModel, QElapsedTimer, QSettings, QTimer
 from PySide6.QtGui import QIcon, QPixmap, QFont, QKeyEvent, QDesktopServices, QColor, QPainter, QPolygon, QAction
 from PySide6.QtMultimedia import QSoundEffect
 from PySide6.QtWidgets import (
@@ -242,7 +232,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     current_player: int = 0  # id of the selected (left click) video player
 
     mem_media_name: str = ""  # record current media name. Use to check if media changed
-    mem_playlist_index: Union[int, None] = None
+    mem_playlist_index: int | None = None
     saved_state = None
     user_move_slider: bool = False
     observationId: str = ""  # current observation id
@@ -739,7 +729,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         text: str = "Behaviors to show in ethogram list",
         table: str = cfg.ETHOGRAM,
         behavior_type: list = cfg.STATE_EVENT_TYPES,
-    ) -> Tuple[bool, list]:
+    ) -> tuple[bool, list]:
         """
         allow user to:
             filter behaviors in ethogram widget
@@ -1510,15 +1500,17 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         logging.debug("previous media file")
 
         if self.playerType == cfg.MEDIA:
-            if len(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.FILE][cfg.PLAYER1]) == 1:
-                return
+            #if len(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.FILE][cfg.PLAYER1]) == 1:
+            #    self.seek_mediaplayer(dec(0))
+            #    return
 
             # check if media not first media
             if self.dw_player[0].player.playlist_pos > 0:
                 self.dw_player[0].player.playlist_prev()
 
             elif self.dw_player[0].player.playlist_count == 1:
-                self.statusbar.showMessage("There is only one media file", 5000)
+                self.seek_mediaplayer(dec(0))
+                #self.statusbar.showMessage("There is only one media file", 5000)
 
             if hasattr(self, "spectro"):
                 self.spectro.memChunk = -1
@@ -3682,14 +3674,18 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         """
         show next frame
         """
+        # frame_step_size = self.config_param.get(cfg.FRAME_STEP_SIZE, cfg.FRAME_STEP_SIZE_DEFAULT_VALUE)
+
         if self.playerType == cfg.IMAGES:
             if self.image_idx < len(self.images_list) - 1:
-                self.image_idx += 1
+                self.image_idx += 1  # frame_step_size
                 self.extract_frame(self.dw_player[0])
 
         if self.playerType == cfg.MEDIA:
             for dw in self.dw_player:
+                # for _ in range(frame_step_size):
                 dw.player.frame_step()
+                # time.sleep(0.5)
 
                 if self.geometric_measurements_mode:
                     self.extract_frame(dw)
@@ -3866,7 +3862,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 write_event.write_event(self, event, cumulative_time)
             # write_event.write_event(self, event, self.getLaps())
 
-    def get_frame_index(self, player_idx: int = 0) -> Union[int, str]:
+    def get_frame_index(self, player_idx: int = 0) -> int | str:
         """
         returns frame index for player player_idx
         """
@@ -3947,7 +3943,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             slider_position = self.video_slider.value() / (cfg.SLIDER_MAXIMUM - 1)
             if self.dw_player[0].player.duration is None:
                 return
-            video_position = slider_position * self.dw_player[0].player.duration
+            print(f"{slider_position=}")
+
+            d = self.dw_player[0].player.duration
+            print(f"{d=}")
+            if d is None:
+                return
+            video_position = slider_position * d
+            # video_position = slider_position * self.dw_player[0].player.duration
             # self.dw_player[0].player.command("seek", str(video_position), "absolute")
             self.dw_player[0].player.seek(video_position, "absolute")
 
@@ -4142,7 +4145,22 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 self.dw_player[n_player].player.playlist_pos = self.dw_player[n_player].player.playlist_count - 1
                 self.seek_mediaplayer(self.dw_player[n_player].media_durations[-1], player=n_player)
 
-    def mpv_timer_out(self, value: Union[float, None] = None, scroll_slider=True):
+    def activate_main_window(self):
+        """
+        activate main window in order to capture keyboard events
+        called only in IPC mode
+        """
+        # check if eof reached
+        #print(f"{self.dw_player[0].player.playlist_pos=}")
+        #print(f"{self.dw_player[0].player.playlist_count=}")
+        if self.dw_player[0].player.eof_reached and self.dw_player[0].player.core_idle:
+            logging.debug("end of playlist reached")
+            if self.dw_player[0].player.playlist_pos is not None and self.dw_player[0].player.playlist_count is not None:
+                if self.dw_player[0].player.playlist_pos == self.dw_player[0].player.playlist_count - 1:
+                    self.pause_video()
+        self.activateWindow()
+
+    def mpv_timer_out(self, value: float | None = None, scroll_slider=True):
         """
         print the media current position and total length for MPV player
         scroll video slider to video position
@@ -4152,13 +4170,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         if not self.observationId:
             return
 
-        print("mpv timer out")
-
         cumulative_time_pos = self.getLaps()
-        print(f"{cumulative_time_pos=}")
         # get frame index
         frame_idx = self.get_frame_index()
-        print(f"{frame_idx=}")
         # frame_idx = 0
 
         if value is None:  # ipc mpv
@@ -4205,8 +4219,9 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 ct = self.getLaps(n_player=n_player)
 
                 # sync players 2..8 if time diff >= 1 s
-                if abs(ct0 - (ct + dec(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET][str(n_player + 1)]))) >= 1:
-                    self.sync_time(n_player, ct0)  # self.seek_mediaplayer(ct0, n_player)
+                if not math.isnan(ct) and not math.isnan(ct0):
+                    if abs(ct0 - (ct + dec(self.pj[cfg.OBSERVATIONS][self.observationId][cfg.MEDIA_INFO][cfg.OFFSET][str(n_player + 1)]))) >= 1:
+                        self.sync_time(n_player, ct0)  # self.seek_mediaplayer(ct0, n_player)
 
         currentTimeOffset = dec(cumulative_time_pos + self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TIME_OFFSET])
 
@@ -4237,12 +4252,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.show_current_states_in_subjects_table()
 
         # current media name
-        print(f"{self.dw_player[0].player.playlist_pos=}")
-        print(f"{self.dw_player[0].player.playlist=}")
-
-        if self.dw_player[0].player.playlist_pos is not None:
-            current_media_name = Path(self.dw_player[0].player.playlist[self.dw_player[0].player.playlist_pos]["filename"]).name
-            current_playlist_index = self.dw_player[0].player.playlist_pos
+        playlist = self.dw_player[0].player.playlist
+        playlist_pos = self.dw_player[0].player.playlist_pos
+        if playlist is not None and playlist_pos is not None:
+            current_media_name = Path(playlist[playlist_pos]["filename"]).name
+            current_playlist_index = playlist_pos
         else:
             current_media_name = ""
             current_playlist_index = None
@@ -4315,8 +4329,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             self.actionPlay.setIcon(QIcon(f":/play_{gui_utilities.theme_mode()}"))
 
-        print(f"{msg=}")
-
         if msg:
             self.lb_current_media_time.setText(msg)
 
@@ -4488,7 +4500,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                 for x in self.pj[cfg.OBSERVATIONS][obs_id][cfg.EVENTS]
             )
 
-    def choose_behavior(self, obs_key) -> Union[None, str]:
+    def choose_behavior(self, obs_key) -> None | str:
         """
         fill listwidget with all behaviors coded by key
 
@@ -4520,7 +4532,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             else:
                 return None
 
-    def choose_subject(self, subject_key) -> Union[None, str]:
+    def choose_subject(self, subject_key) -> None | str:
         """
         fill listwidget with all subjects coded by key
 
@@ -4602,13 +4614,15 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             if self.playerType == cfg.MEDIA:
                 # cumulative time
+                if self.dw_player[n_player].player.time_pos is None:
+                    return dec("NaN")
                 mem_laps = sum(self.dw_player[n_player].media_durations[0 : self.dw_player[n_player].player.playlist_pos]) + (
                     0 if self.dw_player[n_player].player.time_pos is None else self.dw_player[n_player].player.time_pos * 1000
                 )
 
                 return dec(str(round(mem_laps / 1000, 3)))
 
-    def get_obs_time(self, n_player: int = 0) -> Tuple[dec, dec | None]:
+    def get_obs_time(self, n_player: int = 0) -> tuple[dec, dec | None]:
         """
         returns time in current media and cumulative time from begining of observation
         do not add time offset
@@ -4621,7 +4635,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         """
 
         if not self.observationId:
-            return dec("0")
+            return dec("0"), dec("0")
 
         if self.pj[cfg.OBSERVATIONS][self.observationId][cfg.TYPE] == cfg.LIVE:
             if "finished" in self.pb_live_obs.text():
@@ -5457,7 +5471,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         check if first player ended
         """
 
-        print("play_video")
+        logging.debug("play_video")
 
         if self.geometric_measurements_mode:
             return
@@ -5465,6 +5479,13 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         if self.playerType != cfg.MEDIA:
             return
 
+        # check if playlist is ended. If it is ended restart playlist from beginning
+        if self.dw_player[0].player.eof_reached and self.dw_player[0].player.core_idle:
+            if self.dw_player[0].player.playlist_pos is not None and self.dw_player[0].player.playlist_count is not None:
+                if self.dw_player[0].player.playlist_pos == self.dw_player[0].player.playlist_count - 1:
+                    self.seek_mediaplayer(dec(0))
+
+
         # check if player 1 is ended
         for i, dw in enumerate(self.dw_player):
             if (
@@ -5475,9 +5496,6 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
         self.lb_player_status.clear()
 
-        # if self.pj[cfg.OBSERVATIONS][self.observationId].get(cfg.VISUALIZE_WAVEFORM, False) \
-        #    or self.pj[cfg.OBSERVATIONS][self.observationId].get(VISUALIZE_SPECTROGRAM, False):
-
         self.statusbar.showMessage("", 0)
 
         if self.ipc_mpv_timer is not None:
@@ -5554,16 +5572,19 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             decrement = self.fast * self.play_rate if self.config_param.get(cfg.ADAPT_FAST_JUMP, cfg.ADAPT_FAST_JUMP_DEFAULT) else self.fast
 
-            new_time = (
-                sum(self.dw_player[0].media_durations[0 : self.dw_player[0].player.playlist_pos]) / 1000
-                + self.dw_player[0].player.playback_time
-                - decrement
-            )
+            try:
+                new_time = (
+                    sum(self.dw_player[0].media_durations[0 : self.dw_player[0].player.playlist_pos]) / 1000
+                    + self.dw_player[0].player.playback_time
+                    - decrement
+                )
+            except Exception:
+                return
 
             if new_time < decrement:
                 new_time = 0
 
-            self.seek_mediaplayer(new_time)
+            self.seek_mediaplayer(dec(new_time))
 
             self.update_visualizations()
 
@@ -5577,13 +5598,16 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             logging.info(f"Jump forward for {increment} seconds")
 
-            new_time = (
-                sum(self.dw_player[0].media_durations[0 : self.dw_player[0].player.playlist_pos]) / 1000
-                + self.dw_player[0].player.playback_time
-                + increment
-            )
+            try:
+                new_time = (
+                    sum(self.dw_player[0].media_durations[0 : self.dw_player[0].player.playlist_pos]) / 1000
+                    + self.dw_player[0].player.playback_time
+                    + increment
+                )
+            except Exception:
+                return
 
-            self.seek_mediaplayer(new_time)
+            self.seek_mediaplayer(dec(new_time))
 
             self.update_visualizations()
 
@@ -5839,6 +5863,15 @@ def main():
             )
             sys.exit()
 
+        if sys.platform.startswith("darwin"):
+            QMessageBox.warning(
+                None,
+                cfg.programName,
+                (f"This version of BORIS for macOS is still EXPERIMENTAL and should be used at your own risk."),
+                QMessageBox.Ok | QMessageBox.Default,
+                QMessageBox.NoButton,
+            )
+
     window.show()
     window.raise_()  # for overlapping widget (?)
 
@@ -5865,3 +5898,4 @@ def main():
     del window
 
     sys.exit(return_code)
+