Skip to content

Commit

Permalink
Merge pull request #680 from ksooo/timer-props
Browse files Browse the repository at this point in the history
Custom Timer Settings
  • Loading branch information
ksooo authored Sep 10, 2024
2 parents ce9ba70 + 5a028e3 commit d03e546
Show file tree
Hide file tree
Showing 24 changed files with 965 additions and 391 deletions.
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ set(HTS_SOURCES_TVHEADEND
src/tvheadend/AutoRecordings.h
src/tvheadend/ChannelTuningPredictor.h
src/tvheadend/ChannelTuningPredictor.cpp
src/tvheadend/CustomTimerProperties.h
src/tvheadend/CustomTimerProperties.cpp
src/tvheadend/HTSPConnection.h
src/tvheadend/HTSPConnection.cpp
src/tvheadend/HTSPDemuxer.h
Expand Down Expand Up @@ -83,6 +85,8 @@ set(HTS_SOURCES_TVHEADEND_ENTITY
src/tvheadend/entity/Recording.h
src/tvheadend/entity/RecordingBase.h
src/tvheadend/entity/RecordingBase.cpp
src/tvheadend/entity/SeriesRecordingBase.h
src/tvheadend/entity/SeriesRecordingBase.cpp
src/tvheadend/entity/Schedule.h
src/tvheadend/entity/Schedule.cpp
src/tvheadend/entity/Tag.h
Expand Down
2 changes: 1 addition & 1 deletion pvr.hts/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="pvr.hts"
version="22.3.0"
version="22.4.0"
name="Tvheadend HTSP Client"
provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
<requires>@ADDON_DEPENDS@</requires>
Expand Down
7 changes: 7 additions & 0 deletions pvr.hts/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
v22.4.0
- PVR Add-on API v9.1.0
- Add support for Autorec property "Broadcast type" (HTSPv39+)
- Add support for DVR entry property "DVR configuration" (HTSPv40+)
- Add support for DVR entry property "Comment" (HTSPv42+)
- Make timers created by autorec and timerec editable

v22.3.0
- Add support for PVR Providers (HTSPv38+)

Expand Down
46 changes: 42 additions & 4 deletions pvr.hts/resources/language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,13 @@ msgctxt "#30372"
msgid "Record if unique episode according EPG/XMLTV"
msgstr ""

#empty strings from id 30373 to 30374
#. Prevent duplicate episodes representation
#: src/Tvheadend.cpp
msgctxt "#30373"
msgid "Use DVR configuration"
msgstr ""

#empty string with id 30374

#. Recording lifetime representation
#: src/Tvheadend.cpp
Expand Down Expand Up @@ -441,7 +447,15 @@ msgctxt "#30456"
msgid "Subscription error"
msgstr ""

#empty strings from id 30457 to 30499
msgctxt "#30457"
msgid "DVR configuration"
msgstr ""

msgctxt "#30458"
msgid "Comment"
msgstr ""

#empty strings from id 30459 to 30499

msgctxt "#30500"
msgid "Streaming profile"
Expand All @@ -451,8 +465,6 @@ msgctxt "#30501"
msgid "Profile to use (empty = default)"
msgstr ""

#. Check streaming profile validity during startup
#: src/client.cpp
msgctxt "#30502"
msgid "Streaming profile %s is not available"
msgstr ""
Expand All @@ -478,3 +490,29 @@ msgstr ""
msgctxt "#30511"
msgid "Server based play status"
msgstr ""

#empty strings from id 30512 to 30599

msgctxt "#30600"
msgid "Broadcast type"
msgstr ""

msgctxt "#30601"
msgid "Any"
msgstr ""

msgctxt "#30602"
msgid "New / premiere / unknown"
msgstr ""

msgctxt "#30603"
msgid "Repeated"
msgstr ""

msgctxt "#30604"
msgid "New / premiere"
msgstr ""

msgctxt "#30605"
msgid "(Default profile)"
msgstr ""
Loading

0 comments on commit d03e546

Please sign in to comment.