Skip to content

Commit

Permalink
Merge pull request #572 from phunkyfish/default-player
Browse files Browse the repository at this point in the history
Default player for ffmpegdirect
  • Loading branch information
phunkyfish authored Oct 28, 2021
2 parents 8199ff3 + ed1803b commit fb5df8c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pvr.iptvsimple/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.iptvsimple"
version="20.1.1"
version="20.1.2"
name="PVR IPTV Simple Client"
provider-name="nightik and Ross Nicholson">
<requires>@ADDON_DEPENDS@
Expand Down
3 changes: 3 additions & 0 deletions pvr.iptvsimple/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
v20.1.2
- Set default player as VideoPlayer for ffmpegdirect so Timeshift works for PVR Radio

v20.1.1
- Allow VOD or media tags to be used to specify view as PVR Recordings
- Remove news as Kodi 20 will load changelog.txt as a fallback anyway
Expand Down
4 changes: 4 additions & 0 deletions src/iptvsimple/utilities/StreamUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,16 @@ void StreamUtils::SetAllStreamProperties(std::vector<kodi::addon::PVRStreamPrope
CheckInputstreamInstalledAndEnabled(CATCHUP_INPUTSTREAM_NAME))
{
properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, CATCHUP_INPUTSTREAM_NAME);
// this property is required to force VideoPlayer for Radio channels
properties.emplace_back("inputstream-player", "videodefaultplayer");
SetFFmpegDirectManifestTypeStreamProperty(properties, channel, streamURL, streamType);
}
else if (channel.SupportsLiveStreamTimeshifting() && isChannelURL &&
CheckInputstreamInstalledAndEnabled(INPUTSTREAM_FFMPEGDIRECT))
{
properties.emplace_back(PVR_STREAM_PROPERTY_INPUTSTREAM, INPUTSTREAM_FFMPEGDIRECT);
// this property is required to force VideoPlayer for Radio channels
properties.emplace_back("inputstream-player", "videodefaultplayer");
SetFFmpegDirectManifestTypeStreamProperty(properties, channel, streamURL, streamType);
properties.emplace_back("inputstream.ffmpegdirect.stream_mode", "timeshift");
properties.emplace_back("inputstream.ffmpegdirect.is_realtime_stream", "true");
Expand Down

0 comments on commit fb5df8c

Please sign in to comment.