Update xbmc dependency to 19.0a3-Matrix

djp952 · Nov 3, 2020 · 4309039 · 4309039
1 parent 18d29c8
commit 4309039
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 98 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ Copyright (C)2016-2020 Michael G. Brehm
 **OPTIONAL COMPONENTS**   
 * Android NDK r20b for Windows 64-bit   
 * Oracle Java SE Runtime Environment 8   
-* Raspberry Pi Cross-Compiler   
 * OSXCROSS Cross-Compiler (with Mac OSX 10.11 SDK)   
 
 **REQUIRED: CONFIGURE UBUNTU ON WINDOWS**   
@@ -50,14 +49,6 @@ Download the latest jre-8xxx-windows-x64.tar.gz from Oracle:
 * Set a System Environment Variable named JAVA_HOME that points to the location the tar.gz was extracted   
 * Generate a custom public-key certificate that can be used to sign the generated package(s). Follow the instructions provided by Google at the Android Developer [Sign Your App](https://developer.android.com/studio/publish/app-signing.html) page.   
 
-**OPTIONAL: CONFIGURE RASPBERRY PI CROSS-COMPILER**   
-*Necessary to build Raspbian Targets*   
-
-* Open "Ubuntu"   
-```
-git clone https://github.com/raspberrypi/tools.git raspberrypi --depth=1
-```
-
 **OPTIONAL: CONFIGURE OSXCROSS CROSS-COMPILER**   
 *Necessary to build OS X Targets*   
 
@@ -117,7 +108,6 @@ Examples:
 | linux-i686 | Linux X86 | /t:linux-i686 |
 | linux-x86\_64 | Linux X64 | /t:linux-x86\_64 |
 | osx-x86\_64 | Mac OS X X64 | /t:osx-x86\_64 |
-| raspbian-armhf | Raspbian ARM (hard float) | /t:raspbian-armhf |
 | uwp-arm | Universal Windows Platform ARM | /t:uwp-arm |
 | uwp-win32 | Universal Windows Platform X86 | /t:uwp-win32 |
 | uwp-x64 | Universal Windows Platform X64 | /t:uwp-x64 |

diff --git a/depends/xbmc b/depends/xbmc
diff --git a/exportlist/exportlist.raspbian b/exportlist/exportlist.raspbian
diff --git a/manifest/raspbian-armhf.manifest b/manifest/raspbian-armhf.manifest
diff --git a/msbuild.proj b/msbuild.proj
@@ -189,7 +189,7 @@
     <PropertyGroup>
       <CPPFLAGS>-Wall -Wno-unknown-pragmas -I/usr/include/i386-linux-gnu -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/linux-i686/include -Idepends/libuuid/linux-i686/include -Idepends/libxml2/linux-i686/include -Idepends/libz/linux-i686/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version -L/usr/lib/gcc/i686-linux-gnu/4.9</CPPFLAGS>
       <CFLAGS>-DNDEBUG -O2 -fPIC -m32</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11 -m32</CXXFLAGS>
+      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++14 -m32</CXXFLAGS>
     </PropertyGroup>
 
     <MakeDir Directories="out\linux-i686" ContinueOnError="false"/>
@@ -240,7 +240,7 @@
     <PropertyGroup>
       <CPPFLAGS>-Wall -Wno-unknown-pragmas -I/usr/include/x86_64-linux-gnu -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/linux-x86_64/include -Idepends/libuuid/linux-x86_64/include -Idepends/libxml2/linux-x86_64/include -Idepends/libz/linux-x86_64/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version -L/usr/lib/gcc/x86_64-linux-gnu/4.9</CPPFLAGS>
       <CFLAGS>-DNDEBUG -O2 -fPIC</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11</CXXFLAGS>
+      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++14</CXXFLAGS>
     </PropertyGroup>
 
     <MakeDir Directories="out\linux-x86_64" ContinueOnError="false"/>
@@ -291,7 +291,7 @@
     <PropertyGroup>
       <CPPFLAGS>-Wall -Wno-unknown-pragmas -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/linux-armel/include -Idepends/libuuid/linux-armel/include -Idepends/libxml2/linux-armel/include -Idepends/libz/linux-armel/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version</CPPFLAGS>
       <CFLAGS>-DNDEBUG -O2 -fPIC</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11</CXXFLAGS>
+      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++14</CXXFLAGS>
     </PropertyGroup>
 
     <MakeDir Directories="out\linux-armel" ContinueOnError="false"/>
@@ -342,7 +342,7 @@
     <PropertyGroup>
       <CPPFLAGS>-Wall -Wno-unknown-pragmas -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/linux-armhf/include -Idepends/libuuid/linux-armhf/include -Idepends/libxml2/linux-armhf/include -Idepends/libz/linux-armhf/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version</CPPFLAGS>
       <CFLAGS>-DNDEBUG -O2 -fPIC</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11</CXXFLAGS>
+      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++14</CXXFLAGS>
     </PropertyGroup>
 
     <MakeDir Directories="out\linux-armhf" ContinueOnError="false"/>
@@ -393,7 +393,7 @@
     <PropertyGroup>
       <CPPFLAGS>-Wall -Wno-unknown-pragmas -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/linux-aarch64/include -Idepends/libuuid/linux-aarch64/include -Idepends/libxml2/linux-aarch64/include -Idepends/libz/linux-aarch64/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version</CPPFLAGS>
       <CFLAGS>-DNDEBUG -O2 -fPIC</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11</CXXFLAGS>
+      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++14</CXXFLAGS>
     </PropertyGroup>
 
     <MakeDir Directories="out\linux-aarch64" ContinueOnError="false"/>
@@ -438,66 +438,14 @@
 
   </Target>
 
-  <!-- BUILD: RASPBIAN-ARMHF -->
-  <Target Name="raspbian-armhf" DependsOnTargets="AddonVersion">
-
-    <PropertyGroup>
-      <ENV>PATH+=:~/raspberrypi/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin</ENV>
-      <CPPFLAGS>-Wall -Wno-unknown-pragmas -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/raspbian-armhf/include -Idepends/libuuid/raspbian-armhf/include -Idepends/libxml2/raspbian-armhf/include -Idepends/libz/raspbian-armhf/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version</CPPFLAGS>
-      <CFLAGS>-DNDEBUG -O2 -fPIC</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11</CXXFLAGS>
-    </PropertyGroup>
-
-    <MakeDir Directories="out\raspbian-armhf" ContinueOnError="false"/>
-    <MakeDir Directories="out\repository" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_channels.c -o out/raspbian-armhf/hdhomerun_channels.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_channelscan.c -o out/raspbian-armhf/hdhomerun_channelscan.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_control.c -o out/raspbian-armhf/hdhomerun_control.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_debug.c -o out/raspbian-armhf/hdhomerun_debug.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_device.c -o out/raspbian-armhf/hdhomerun_device.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_device_selector.c -o out/raspbian-armhf/hdhomerun_device_selector.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_discover.c -o out/raspbian-armhf/hdhomerun_discover.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_os_posix.c -o out/raspbian-armhf/hdhomerun_os_posix.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_pkt.c -o out/raspbian-armhf/hdhomerun_pkt.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_sock_posix.c -o out/raspbian-armhf/hdhomerun_sock_posix.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -c depends/libhdhomerun/hdhomerun_video.c -o out/raspbian-armhf/hdhomerun_video.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) $(CFLAGS) -DSQLITE_THREADSAFE=2 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_TEMP_STORE=3 -c depends/sqlite/sqlite3.c -o out/raspbian-armhf/sqlite3.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/addon.cpp -o out/raspbian-armhf/addon.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/curlshare.cpp -o out/raspbian-armhf/curlshare.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/database.cpp -o out/raspbian-armhf/database.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/dbextension.cpp -o out/raspbian-armhf/dbextension.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/devicestream.cpp -o out/raspbian-armhf/devicestream.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/httpstream.cpp -o out/raspbian-armhf/httpstream.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/scheduler.cpp -o out/raspbian-armhf/scheduler.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/sqlite_exception.cpp -o out/raspbian-armhf/sqlite_exception.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -c src/xmlstream.cpp -o out/raspbian-armhf/xmlstream.o&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-g++ $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,--version-script=exportlist/exportlist.raspbian out/raspbian-armhf/addon.o out/raspbian-armhf/curlshare.o out/raspbian-armhf/database.o out/raspbian-armhf/dbextension.o out/raspbian-armhf/devicestream.o out/raspbian-armhf/hdhomerun_channels.o out/raspbian-armhf/hdhomerun_channelscan.o out/raspbian-armhf/hdhomerun_control.o out/raspbian-armhf/hdhomerun_debug.o out/raspbian-armhf/hdhomerun_device.o out/raspbian-armhf/hdhomerun_device_selector.o out/raspbian-armhf/hdhomerun_discover.o out/raspbian-armhf/hdhomerun_os_posix.o out/raspbian-armhf/hdhomerun_pkt.o out/raspbian-armhf/hdhomerun_sock_posix.o out/raspbian-armhf/hdhomerun_video.o out/raspbian-armhf/httpstream.o out/raspbian-armhf/scheduler.o out/raspbian-armhf/sqlite3.o out/raspbian-armhf/sqlite_exception.o out/raspbian-armhf/xmlstream.o depends/libcurl/raspbian-armhf/lib/libcurl.a depends/libuuid/raspbian-armhf/lib/libuuid.a depends/libxml2/raspbian-armhf/lib/libxml2.a depends/libz/raspbian-armhf/lib/libz.a -ldl -lpthread -o out/raspbian-armhf/zuki.pvr.hdhomerundvr.so&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;$(ENV) arm-linux-gnueabihf-gcc $(CPPFLAGS) -DSQLITE_ENABLE_JSON1=1 depends/sqlite/sqlite3.c depends/sqlite/shell.c -o out/raspbian-armhf/sqlite3 -ldl -lpthread&quot;" ContinueOnError="false"/>
-    <Exec Command="TextTransform.exe template\addon.xml.tt -out tmp\addon-raspbian-armhf.xml -a !!platform!linux -a !!libraryplatform!linux -a !!libraryname!zuki.pvr.hdhomerundvr.so -a !!changelogtxt!pvr.hdhomerundvr\changelog.txt -a &quot;!!displayversion!$(DisplayVersion)&quot; -a &quot;!!repomanifest!raspbian-armhf.xml.gz&quot;" ContinueOnError="false"/>
-    <XmlPeek XmlInputPath="tmp\addon-raspbian-armhf.xml" Query="/addon/@version">
-      <Output TaskParameter="Result" PropertyName="PeekedDisplayVersion"/>
-    </XmlPeek>
-    <Error Condition="'$(PeekedDisplayVersion)' != '$(DisplayVersion)'" Text="DisplayVersion build property was not properly applied to the addon.xml text template"/>
-    <Exec Command="$(ZipperExe) create out\zuki.pvr.hdhomerundvr-raspbian-armhf-$(KodiBaseline)-$(AddonVersion).zip manifest\raspbian-armhf.manifest -sha256" ContinueOnError="false"/>
-
-    <GetFileSize filename="out\zuki.pvr.hdhomerundvr-raspbian-armhf-$(KodiBaseline)-$(AddonVersion).zip">
-      <Output PropertyName="ZipFileSize" TaskParameter="size"/>
-    </GetFileSize>
-
-    <Exec Command="TextTransform.exe template\addons.xml.tt -out &quot;tmp\repo-raspbian-armhf.xml&quot; -a !!platform!linux -a !!libraryplatform!linux -a !!libraryname!zuki.pvr.hdhomerundvr.so -a &quot;!!displayversion!$(DisplayVersion)&quot; -a !!zipfilesize!$(ZipFileSize) -a !!zipfilename!zuki.pvr.hdhomerundvr-raspbian-armhf-$(KodiBaseline)-$(AddonVersion).zip" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;gzip -cf tmp/repo-raspbian-armhf.xml &gt; out/repository/raspbian-armhf.xml.gz&quot;" ContinueOnError="false"/>
-    <Exec Command="$(BashExe) -c &quot;pushd out/repository/ ; sha256sum raspbian-armhf.xml.gz &gt; raspbian-armhf.xml.gz.sha256 ; popd&quot;" ContinueOnError="false"/>
-
-  </Target>
-
   <!-- BUILD: OSX-X86_64 -->
   <Target Name="osx-x86_64" DependsOnTargets="AddonVersion">
 
     <PropertyGroup>
       <ENV>OSXCROSS_NO_EXTENSION_WARNINGS=1 PATH+=:~/osxcross/target/bin</ENV>
       <CPPFLAGS>-mmacosx-version-min=10.9 -Wall -Wno-unknown-pragmas -Idepends/xbmc/xbmc -Idepends/xbmc/xbmc/linux -Idepends/xbmc/xbmc/addons/kodi-dev-kit/include -Idepends/http-status-codes-cpp -Idepends/libcurl/osx-x86_64/include -Idepends/libuuid/osx-x86_64/include -Idepends/libxml2/osx-x86_64/include -Idepends/libz/osx-x86_64/include -Idepends/libhdhomerun -Idepends/rapidjson/include -Idepends/sqlite -Itmp/version</CPPFLAGS>
       <CFLAGS>-DNDEBUG -O2 -fPIC -stdlib=libc++</CFLAGS>
-      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++11 -stdlib=libc++</CXXFLAGS>
+      <CXXFLAGS>-DNDEBUG -O2 -fPIC -std=c++14 -stdlib=libc++</CXXFLAGS>
     </PropertyGroup>
 
     <MakeDir Directories="out\osx-x86_64" ContinueOnError="false"/>
@@ -663,11 +611,10 @@
   <Target Name="uwp" DependsOnTargets="uwp-win32;uwp-x64;uwp-arm"/>
   <!-- <Target Name="uwpappx" DependsOnTargets="uwpappx-x64"/> -->
   <Target Name="linux" DependsOnTargets="linux-i686;linux-x86_64;linux-armel;linux-armhf;linux-aarch64"/>
-  <Target Name="raspbian" DependsOnTargets="raspbian-armhf"/>
   <Target Name="osx" DependsOnTargets="osx-x86_64"/>
   <Target Name="android" DependsOnTargets="android-arm;android-aarch64;android-x86"/>
 
   <!-- BUILD: ALL -->
-  <Target Name="all" DependsOnTargets="windows;uwp;linux;raspbian;osx;android"/>
+  <Target Name="all" DependsOnTargets="windows;uwp;linux;osx;android"/>
 
 </Project>
diff --git a/pvr.hdhomerundvr.sln b/pvr.hdhomerundvr.sln
@@ -51,7 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "manifest", "manifest", "{03
 		manifest\linux-i686.manifest = manifest\linux-i686.manifest
 		manifest\linux-x86_64.manifest = manifest\linux-x86_64.manifest
 		manifest\osx-x86_64.manifest = manifest\osx-x86_64.manifest
-		manifest\raspbian-armhf.manifest = manifest\raspbian-armhf.manifest
 		manifest\uwp-arm.manifest = manifest\uwp-arm.manifest
 		manifest\uwp-win32.manifest = manifest\uwp-win32.manifest
 		manifest\uwp-x64.manifest = manifest\uwp-x64.manifest
@@ -64,7 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "exportlist", "exportlist",
 		exportlist\exportlist.android = exportlist\exportlist.android
 		exportlist\exportlist.linux = exportlist\exportlist.linux
 		exportlist\exportlist.osx = exportlist\exportlist.osx
-		exportlist\exportlist.raspbian = exportlist\exportlist.raspbian
 		exportlist\exportlist.uwp = exportlist\exportlist.uwp
 		exportlist\exportlist.windows = exportlist\exportlist.windows
 	EndProjectSection

diff --git a/pvr.hdhomerundvr/changelog.txt b/pvr.hdhomerundvr/changelog.txt
@@ -1,3 +1,6 @@
+v3.3.3a (2020.11.03)
+  - Update for compatibility with Matrix Alpha 3 release
+
 v3.3.3 (2020.09.30)
   - Update SQLite database engine to version 3.33.0
   - Update cURL library to version 7.72.0

diff --git a/src/addon.cpp b/src/addon.cpp
@@ -3338,7 +3338,7 @@ PVR_ERROR addon::GetStreamTimes(kodi::addon::PVRStreamTimes& times)
 	// Set the timeshift duration to the delta between the start time and the lesser of the 
 	// current wall clock time or the known stream end time
 	time_t now = time(nullptr);
-	times.SetPTSEnd(static_cast<int64_t>(((now < m_stream_endtime) ? now : m_stream_endtime) - m_stream_starttime) * DVD_TIME_BASE);
+	times.SetPTSEnd(static_cast<int64_t>(((now < m_stream_endtime) ? now : m_stream_endtime) - m_stream_starttime) * STREAM_TIME_BASE);
 
 	return PVR_ERROR::PVR_ERROR_NO_ERROR;
 }

diff --git a/src/sqlite3.vcxproj b/src/sqlite3.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{B43F7D9E-C32E-4D8A-B394-6D4E4778A7F5}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>sqlite3</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -101,6 +101,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;SQLITE_ENABLE_JSON1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\depends\sqlite</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -115,6 +116,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;SQLITE_ENABLE_JSON1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\depends\sqlite</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -131,6 +133,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;SQLITE_ENABLE_JSON1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\depends\sqlite</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -149,6 +152,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;SQLITE_ENABLE_JSON1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\depends\sqlite</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp14</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>