diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/CONTRIBUTORS vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/CONTRIBUTORS --- vdr-plugin-streamdev-0.6.1.git20170120/CONTRIBUTORS 2017-01-20 15:15:19.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/CONTRIBUTORS 2017-09-30 19:31:48.000000000 +0000 @@ -254,3 +254,8 @@ David Binderman for fixing an lseek error check in libdvbmpeg + +Jasmin J + for fixing some warnings in libdvbmpeg + for adding .gitignore + for fixing compilation for VDR 2.3.7 diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/debian/changelog vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/changelog --- vdr-plugin-streamdev-0.6.1.git20170120/debian/changelog 2017-12-15 09:46:48.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/changelog 2017-12-15 10:43:39.000000000 +0000 @@ -1,26 +1,21 @@ -vdr-plugin-streamdev (0.6.1.git20170120-3ckone2~trusty) trusty; urgency=medium +vdr-plugin-streamdev (0.6.1.git20170930-340-e2a9b97-0ckone0~trusty) trusty; urgency=medium * automatic rebuild - -- CKone Fri, 15 Dec 2017 10:46:48 +0100 + -- CKone Fri, 15 Dec 2017 11:43:39 +0100 -vdr-plugin-streamdev (0.6.1.git20170120-3ckone1~trusty) trusty; urgency=medium +vdr-plugin-streamdev (0.6.1.git20170930-340-e2a9b97-0yavdr0~trusty) trusty; urgency=medium - * automatic rebuild + * new upstream snapshot + * drop obsolete patches - -- CKone Mon, 03 Jul 2017 12:34:24 +0200 + -- Alexander Grothe Sun, 01 Oct 2017 11:32:17 +0200 -vdr-plugin-streamdev (0.6.1.git20170120-3ckone0~trusty) trusty; urgency=medium +vdr-plugin-streamdev (0.6.1.git20170120-2yavdr2~xenial) xenial; urgency=medium * automatic rebuild - -- CKone Mon, 12 Jun 2017 16:24:14 +0200 - -vdr-plugin-streamdev (0.6.1.git20170120-3ckone0~xenial) xenial; urgency=medium - - * added streamdev-channelchange.patch - - -- CKone Mon, 12 Jun 2017 15:06:43 +0200 + -- Alexander Grothe Fri, 30 Jun 2017 19:16:59 +0200 vdr-plugin-streamdev (0.6.1.git20170120-2yavdr1~xenial) xenial; urgency=medium diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/debian/patches/series vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/patches/series --- vdr-plugin-streamdev-0.6.1.git20170120/debian/patches/series 2017-06-12 13:02:06.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/patches/series 2017-10-01 09:33:48.000000000 +0000 @@ -1,5 +1,2 @@ makefile_fix.patch streamdev-hevc.diff -jasminj-fixed-some-warnings.diff -streamdev_vdr-2.3.7-compat.diff -streamdev-channelchange.patch diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/debian/patches/streamdev-channelchange.patch vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/patches/streamdev-channelchange.patch --- vdr-plugin-streamdev-0.6.1.git20170120/debian/patches/streamdev-channelchange.patch 2017-06-12 13:02:06.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/patches/streamdev-channelchange.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vdr-plugin-streamdev (0.6.1.git20170120-1ckone3~xenial) xenial; urgency=medium - . - * automatic rebuild -Author: CKone - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - -Index: vdr-plugin-streamdev-0.6.1.git20170120/server/livestreamer.c -=================================================================== ---- vdr-plugin-streamdev-0.6.1.git20170120.orig/server/livestreamer.c -+++ vdr-plugin-streamdev-0.6.1.git20170120/server/livestreamer.c -@@ -9,6 +9,7 @@ - #include "remux/extern.h" - - #include -+#include - - #include "server/livestreamer.h" - #include "server/setup.h" -@@ -673,23 +674,38 @@ bool cStreamdevLiveStreamer::ProvidesCha - - void cStreamdevLiveStreamer::ChannelChange(const cChannel *Channel) - { -- if (Running() && m_Device && m_Channel == Channel) { -- // Check whether the Caids actually changed -- // If not, no need to re-tune, probably just an Audio PID update -- if (!memcmp(m_Caids, Channel->Caids(), sizeof(m_Caids))) { -- dsyslog("streamdev: channel %d (%s) changed, but caids remained the same, not re-tuning", Channel->Number(), Channel->Name()); -- } -- else { -- Detach(); -- if (m_Device->SwitchChannel(m_Channel, false)) { -- Attach(); -- dsyslog("streamdev: channel %d (%s) changed, re-tuned", Channel->Number(), Channel->Name()); -- memcpy(m_Caids, Channel->Caids(), sizeof(m_Caids)); -- } -- else -- isyslog("streamdev: failed to re-tune after channel %d (%s) changed", Channel->Number(), Channel->Name()); -- } -- } -+ if (Running() && m_Device && m_Channel == Channel) { -+ Detach(); -+ -+ // check if any device is able to decrypt the channel - code taken from VDR -+ int NumUsableSlots = 0; -+ -+ if (Channel->Ca() >= CA_ENCRYPTED_MIN) { -+ for (cCamSlot *CamSlot = CamSlots.First(); CamSlot; CamSlot = CamSlots.Next(CamSlot)) { -+ if (CamSlot->ModuleStatus() == msReady) { -+ if (CamSlot->ProvidesCa(Channel->Caids())) { -+ if (!ChannelCamRelations.CamChecked(Channel->GetChannelID(), CamSlot->SlotNumber())) { -+ NumUsableSlots++; -+ } -+ } -+ } -+ } -+ if (!NumUsableSlots) { -+ isyslog("streamdev: cam slot not available"); -+ return; -+ } -+ } -+ -+ if (m_Device = cDevice::GetDevice(Channel, LIVEPRIORITY, false)) { -+ if (m_Device->SwitchChannel(Channel, false)) { -+ Attach(); -+ } else { -+ isyslog("streamdev: failed to re-tune after channel %d (%s) changed", Channel->Number(), Channel->Name()); -+ } -+ } else { -+ isyslog("streamdev: device not available"); -+ } -+ } - } - - void cStreamdevLiveStreamer::MainThreadHook() diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/debian/patches/streamdev-hevc.diff vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/patches/streamdev-hevc.diff --- vdr-plugin-streamdev-0.6.1.git20170120/debian/patches/streamdev-hevc.diff 2017-01-20 17:12:48.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/debian/patches/streamdev-hevc.diff 2017-10-01 09:33:07.000000000 +0000 @@ -1,6 +1,6 @@ --- a/server/livestreamer.c +++ b/server/livestreamer.c -@@ -135,6 +135,8 @@ +@@ -143,6 +143,8 @@ "ISO/IEC 14496-3 Audio with LATM transport syntax", "0x12", "0x13", "0x14", "0x15", "0x16", "0x17", "0x18", "0x19", "0x1a", "ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264)", @@ -9,7 +9,7 @@ "", }; -@@ -163,6 +165,7 @@ +@@ -171,6 +173,7 @@ case 0x10: // ISO/IEC 14496-2 Visual (MPEG-4) case 0x11: // ISO/IEC 14496-3 Audio with LATM transport syntax case 0x1b: // ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264) diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/.gitignore vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/.gitignore --- vdr-plugin-streamdev-0.6.1.git20170120/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/.gitignore 2017-09-30 19:31:48.000000000 +0000 @@ -0,0 +1,25 @@ +# Compiled Object files +*.slo +*.lo +*.o + +# Compiled Dynamic libraries +*.so +*.dylib + +# Compiled Static libraries +*.lai +*.la +*.a + +# Eclipse project files +.project +.cproject +.settings + +# Generated dependency file +.dependencies + +# translations +*.mo +*.pot diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/HISTORY vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/HISTORY --- vdr-plugin-streamdev-0.6.1.git20170120/HISTORY 2017-01-20 15:15:19.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/HISTORY 2017-09-30 19:31:48.000000000 +0000 @@ -1,6 +1,9 @@ VDR Plugin 'streamdev' Revision History --------------------------------------- +- fixed compilation for VDR 2.3.7 (thanks to Jasmin J) +- added .gitignore (thanks to Jasmin J) +- fixed some warnings in libdvbmpeg (thanks to Jasmin J) - fixed lseek error check in libdvbmpeg (thanks to David Binderman) - server compatibility with VDR 2.3.1 (thanks to Christopher Reimer and Matthias Senzel) diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/libdvbmpeg/ctools.c vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/libdvbmpeg/ctools.c --- vdr-plugin-streamdev-0.6.1.git20170120/libdvbmpeg/ctools.c 2017-01-20 15:15:19.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/libdvbmpeg/ctools.c 2017-09-30 19:31:48.000000000 +0000 @@ -298,7 +298,6 @@ } static unsigned int find_length(int f){ - uint64_t p = 0; uint64_t start = 0; uint64_t q = 0; int found = 0; @@ -309,7 +308,7 @@ start -=2; lseek(f,start,SEEK_SET); while ( neof > 0 && !found ){ - p = lseek(f,0,SEEK_CUR); + lseek(f,0,SEEK_CUR); neof = save_read(f,&sync4,4); if (sync4[0] == 0x00 && sync4[1] == 0x00 && sync4[2] == 0x01) { switch ( sync4[3] ) { @@ -1334,7 +1333,7 @@ { int l,c; int tpid; - uint8_t flag,flags; + uint8_t flags; uint8_t adapt_length = 0; uint8_t cpid[2]; @@ -1350,7 +1349,6 @@ tpid); } - flag = cpid[0]; flags = p->packet[3]; if ( flags & ADAPT_FIELD ) { diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/libdvbmpeg/remux.c vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/libdvbmpeg/remux.c --- vdr-plugin-streamdev-0.6.1.git20170120/libdvbmpeg/remux.c 2017-01-20 15:15:19.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/libdvbmpeg/remux.c 2017-09-30 19:31:48.000000000 +0000 @@ -756,7 +756,6 @@ int pos = 0; int p = 0; uint32_t pts = 0; - uint32_t dts = 0; int stuff = 0; int length = *vlength; long diff = 0; @@ -787,7 +786,6 @@ if (add < 0) return -1; pos += add; rem->vpts_old = rem->vpts; - dts = rem->vdts; rem->vpts = rem->vpts_list[0].PTS; rem->vdts = rem->vpts_list[0].dts; if ( diff > 0) rem->SCR += diff; diff -Nru vdr-plugin-streamdev-0.6.1.git20170120/server/connectionVTP.c vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/server/connectionVTP.c --- vdr-plugin-streamdev-0.6.1.git20170120/server/connectionVTP.c 2017-01-20 15:15:19.000000000 +0000 +++ vdr-plugin-streamdev-0.6.1.git20170930-340-e2a9b97/server/connectionVTP.c 2017-09-30 19:31:48.000000000 +0000 @@ -41,7 +41,9 @@ enum eStates { Channel, Event, Title, Subtitle, Description, Vps, Content, Rating, EndEvent, EndChannel, EndEPG }; cConnectionVTP *m_Client; +#if APIVERSNUM < 20300 cSchedulesLock *m_SchedulesLock; +#endif const cSchedules *m_Schedules; const cSchedule *m_Schedule; const cEvent *m_Event; @@ -210,7 +212,9 @@ cLSTEHandler::~cLSTEHandler() { +#if APIVERSNUM < 20300 delete m_SchedulesLock; +#endif } bool cLSTEHandler::Next(bool &Last)