10.3.4

CONTROL/control

@@ -1,6 +1,7 @@
 Description: TimeshiftCockpit
 Maintainer: dream-alpha
 Package: enigma2-plugin-extensions-timeshiftcockpit
-Version: 8.4.1
+Version: 10.3.4
 Architecture: all
-Depends: enigma2-plugin-skincomponents-cockpit, enigma2-plugin-systemplugins-powercockpit
+Conflicts: enigma2-plugin-extensions-permanenttimeshift
+Depends: enigma2-plugin-skincomponents-cockpit, enigma2-plugin-systemplugins-powercockpit, enigma2-plugin-systemplugins-covercockpit, enigma2-plugin-systemplugins-jobcockpit

CONTROL/postinst

@@ -1,5 +1,17 @@
 #!/bin/sh
 
+model=$(cat /proc/stb/info/model)
+echo $model
+if [ $model = "one" ] || [ $model = "two" ]; then
+	echo "ONE or TWO"
+	arch="aarch64"
+else
+	echo "DM9xx"
+	arch="armhf"
+fi
+plugin_path=/usr/lib/enigma2/python/Plugins/Extensions/TimeshiftCockpit
+cp $plugin_path/bin/$arch/* $plugin_path/.
+
 echo "***********************************"
 echo "*         TimeshiftCockpit        *"
 echo "*               by                *"

Makefile.am

@@ -1 +1 @@
-SUBDIRS = po src
+SUBDIRS = po src bin

README.md

@@ -2,37 +2,66 @@
 [![Gemfury](https://badge.fury.io/fp/gemfury.svg)](https://gemfury.com/f/partner)
 
 # TimeshiftCockpit (TSC)
-![Screenshot](ts.png)
+![Screenshot](ts1.png)
 
+Menu key gets you a choice list of timeshift events for easy playback.
 ![Screenshot](ts2.png)
 
+REC key gets you a choice list of timeshift events for easy recording.
+![Screenshot](ts3.png)
+
+Configuration menu allows the preset of up to 2 permanent timeshift services.
+![Screenshot](ts4.png)
+
+Timeshifts Overview show all active timeshift services.
+![Screenshot](ts5.png)
+
+Job Management menu allows to manage all timeshift recordings.
+![Screenshot](ts6.png)
+
 ## Features
-TimeshiftCockpit is a plugin for DreamOS receivers that provides advanced timeshifting functionality like regular on demand timeshifting as well as permanent timeshifting.
+TimeshiftCockpit is a plugin for DreamOS receivers that provides advanced timeshift functionality
+
+- on demand timeshift (only timeshifts when manually started and stopped)
+- permanent timeshift
+	- variable permanent timeshift (always timeshifts current channel)
+	- fixed permanent timeshift (of up to 2 fixed services)
+- creation of recordings of every timeshift event (pressing the REC key)
+- download of event covers from various sources
+
+## Usage
+
+- PLAY/PAUSE to start on demand timeshift or playback of permanent timeshift
+- On demand timeshift: STOP to exit timeshift playback and stop timeshift recording
+- Permanent timeshift: STOP/EXIT to exit timeshift playback but continue with timeshift recording
+- Cursor LEFT/RIGHT for fast forward/backward
+- Cursor UP/DOWN to enter channel selection list
+- CHANNEL/BOUQUET up/down for intelligent jump
+- TAB left/right for previous/next event
+- Permanent timeshift: MENU to display a choice list of events for playback
+- REC to record any event contained in timeshift. If the event is the last one in timeshift and incomplete, timeshift will continue until the event is complete. If power off is pressed before recording is complete, recording will continue in idle mode.
+- YELLOW shows a list of timeshift recording jobs
+- BLUE shows a list of active timeshifts
 
 ## Limitations
-- TSC is being tested on DM 920 and DM ONE only
-- May not work properly on AIO images due to driver changes
+
+- TSC is being tested on DM 920 and DM ONE (OE 2.6) only
+- TSC may not work properly on AIO images due to driver changes
+- TSC permanent timeshift is recommended for boxes with FBC tuners only (full permanent timeshift needs up to 4 tuners)
 
 ## Conflicts
-- TSC conflicts with the permanent timeshift plugin (PTS), so both plugins can't coexist on the box
 
-## Usage
-- Play/pause to start timeshift
-- On demand timeshift: Stop to exit timeshift playback and stop timeshift recording
-- Permanent timeshift: Stop/Exit to exit timeshift playback but continue timeshift recording
-- Cursor Left/right for fast forward/backward
-- Cursor up/down to enter channel selection list
-- Channel/Bouquet up/down for intelligent jump
-- Tab left/right for previous/next event
-- Permanent timeshift: Menu to display a choice list of events for playback
+- TSC conflicts with the permanent timeshift plugin (PTS), so remove PTS before installing TimeshiftCockpit
 
 ## Languages
+
 - english
 - german
 - italian (by Spaeleus)
 - spanish (by Magog)
 
 ## Links
+
 - Installation: https://dream-alpha.github.io/TimeshiftCockpit
 - Feed: https://gemfury.com/dream-alpha
 - Support: https://github.com/dream-alpha/TimeshiftCockpit/discussions

bin/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = aarch64 armhf

bin/aarch64/Makefile.am

@@ -0,0 +1,2 @@
+installdir = $(libdir)/enigma2/python/Plugins/Extensions/TimeshiftCockpit/bin/aarch64
+install_DATA = *.so createapscfiles

bin/armhf/Makefile.am

@@ -0,0 +1,2 @@
+installdir = $(libdir)/enigma2/python/Plugins/Extensions/TimeshiftCockpit/bin/armhf
+install_DATA = *.so createapscfiles

po/TimeshiftCockpit.pot

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Common\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-14 13:51+0200\n"
+"POT-Creation-Date: 2024-09-07 13:32+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: dream-alpha\n"
 "Language-Team: \n"
@@ -11,14 +11,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 3.4.4\n"
+"X-Generator: Poedit 3.5\n"
 "X-Loco-Source-Locale: en-US\n"
 "X-Loco-Project-Id: 47158\n"
 "X-Loco-Api-Version: 1.0.19 20180501-1\n"
 "X-Poedit-Basepath: ../src\n"
 "X-Generator: Poedit 2.4.2\n"
 "X-Poedit-SearchPath-0: .\n"
 
+msgid "Select bouquet"
+msgstr ""
+
+msgid "Select channel"
+msgstr ""
+
 msgid "Stop timeshift"
 msgstr ""
 
@@ -34,15 +40,39 @@ msgstr ""
 msgid "Previous event"
 msgstr ""
 
-msgid "Show Events"
+msgid "Show events"
+msgstr ""
+
+msgid "Record timeshift Event"
+msgstr ""
+
+msgid "Show active timeshifts"
+msgstr ""
+
+msgid "Manage timeshift recordings"
 msgstr ""
 
 msgid "Open service list"
 msgstr ""
 
+msgid "Select a timeshift event for playback"
+msgstr ""
+
+msgid "Select a timeshift event for recording"
+msgstr ""
+
+msgid "Recording timeshift event now"
+msgstr ""
+
 msgid "Timeshift directory does not exist"
 msgstr ""
 
+msgid "Inactive"
+msgstr ""
+
+msgid "Reset"
+msgstr ""
+
 msgid "GENERAL"
 msgstr ""
 
@@ -58,6 +88,33 @@ msgstr ""
 msgid "Select to enable permanent timeshift."
 msgstr ""
 
+msgid "Fixed timeshift service #1"
+msgstr ""
+
+msgid "Press OK to select service for fixed timeshift #1."
+msgstr ""
+
+msgid "Fixed timeshift service #2"
+msgstr ""
+
+msgid "Press OK to select service for fixed timeshift #2."
+msgstr ""
+
+msgid "RECORDING"
+msgstr ""
+
+msgid "Recording directory"
+msgstr ""
+
+msgid "Select directory for timeshift recordings."
+msgstr ""
+
+msgid "Cover source"
+msgstr ""
+
+msgid "Select the cover source."
+msgstr ""
+
 msgid "DEBUG"
 msgstr ""
 
@@ -67,10 +124,10 @@ msgstr ""
 msgid "Select debug log level."
 msgstr ""
 
-msgid "Events"
+msgid "Select"
 msgstr ""
 
-msgid "Select"
+msgid "No timeshift available for playback"
 msgstr ""
 
 msgid "min"
@@ -79,6 +136,33 @@ msgstr ""
 msgid "Write error while recording. Disk full?"
 msgstr ""
 
+msgid "TS recording"
+msgstr ""
+
+msgid "Timeshift recording"
+msgstr ""
+
+msgid "Exit"
+msgstr ""
+
+msgid "Timeshifts Overview"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "type"
+msgstr ""
+
+msgid "fixed"
+msgstr ""
+
+msgid "variable"
+msgstr ""
+
+msgid "recordings"
+msgstr ""
+
 msgid "Setup"
 msgstr ""
 
@@ -94,9 +178,6 @@ msgstr ""
 msgid "Skip backward"
 msgstr ""
 
-msgid "Cancel"
-msgstr ""
-
 msgid "Save"
 msgstr ""
 
@@ -123,3 +204,6 @@ msgstr ""
 
 msgid "Path does not exist"
 msgstr ""
+
+msgid "automatic"
+msgstr ""