Merge branch 'release-1.7.11'

.gitignore

@@ -2,6 +2,7 @@
 *.aps
 *.db
 *.old
+*.opendb
 *.opensdf
 *.psess
 *.pyc

.gitmodules

@@ -1,3 +1,6 @@
+[submodule "bs2b"]
+    path = src/thirdparty/bs2b/libbs2b
+    url = https://github.com/alexmarsev/libbs2b.git
 [submodule "LAVFilters"]
     path = src/thirdparty/LAVFilters/src
     url = https://github.com/mpc-hc/LAVFilters.git
@@ -7,22 +10,31 @@
 [submodule "MediaInfoLib"]
     path = src/thirdparty/MediaInfo/library
     url = https://github.com/MediaArea/MediaInfoLib.git
+[submodule "NanoSVG"]
+    path = src/thirdparty/nanosvg
+    url = https://github.com/memononen/nanosvg.git
+[submodule "rapidjson"]
+    path = src/thirdparty/rapidjson
+    url = https://github.com/miloyip/rapidjson.git
 [submodule "RARFileSource"]
     path = src/thirdparty/RARFileSource/library
     url = https://github.com/mpc-hc/rarfilesource.git
-[submodule "ZenLib"]
-    path = src/thirdparty/ZenLib/library
-    url = https://github.com/MediaArea/ZenLib.git
-[submodule "soxr"]
-    path = src/thirdparty/soxr/libsoxr
-    url = https://github.com/alexmarsev/soxr.git
-[submodule "bs2b"]
-    path = src/thirdparty/bs2b/libbs2b
-    url = https://github.com/alexmarsev/libbs2b.git
-[submodule "soundtouch"]
-    path = src/thirdparty/SoundTouch/soundtouch
-    url = https://github.com/alexmarsev/soundtouch.git
 [submodule "sanear"]
     path = src/thirdparty/sanear/sanear
     url = https://github.com/alexmarsev/sanear.git
     branch = core
+[submodule "soundtouch"]
+    path = src/thirdparty/SoundTouch/soundtouch
+    url = https://github.com/alexmarsev/soundtouch.git
+[submodule "soxr"]
+    path = src/thirdparty/soxr/libsoxr
+    url = https://github.com/alexmarsev/soxr.git
+[submodule "tinyxml2"]
+    path = src/thirdparty/tinyxml2/library
+    url = https://github.com/leethomason/tinyxml2.git
+[submodule "XmlRpc4Win"]
+    path = src/thirdparty/XmlRpc4Win
+    url = https://github.com/drtimcooper/XmlRpc4Win.git
+[submodule "ZenLib"]
+    path = src/thirdparty/ZenLib/library
+    url = https://github.com/MediaArea/ZenLib.git

Readme.md

@@ -20,6 +20,7 @@ See [CONTRIBUTING.md](/CONTRIBUTING.md) for more info.
 
 
 ## Main Features:
+
 * Option to remove [tearing](https://en.wikipedia.org/wiki/Screen_tearing)
 * Support for Windows Vista/7/8, including a 64-bit build
 * Support for [EVR/EVR CP](https://en.wikipedia.org/wiki/Media_Foundation#Enhanced_Video_Renderer) (Enhanced Video Renderer)
@@ -31,15 +32,17 @@ See [CONTRIBUTING.md](/CONTRIBUTING.md) for more info.
 * Multi-Monitor support
 * Various [pixel shaders](https://en.wikipedia.org/wiki/Shader#Pixel_shaders)
 * [Color management](https://en.wikipedia.org/wiki/Color_management)
-* 41 translations available
+* 42 translations available
 
 
 ## System Requirements:
+
 * An SSE capable CPU
 * Windows XP SP3, Vista, 7, 8, 8.1, 10 32-bit/64-bit
 
 
 ## Links:
+
 * [Website](https://mpc-hc.org/)
 * [Source code](https://github.com/mpc-hc)
 * [Support Trac](https://trac.mpc-hc.org/)
@@ -63,26 +66,30 @@ MPC-HC makes use of the following third-party code:
 
 | Project           | License                   | Website           |
 | ----------------- | ------------------------- | ----------------- |
-| bs2b              | MIT License               | http://bs2b.sourceforge.net |
-| CSizingControlBar | -                         | http://www.datamekanix.com/sizecbar/ |
-| LAV Filters       | GPLv2+                    | https://github.com/Nevcairiel/LAVFilters |
-| libdivide         | zlib License              | http://libdivide.com/ |
-| Little CMS        | MIT License               | http://www.littlecms.com/ |
+| bs2b              | MIT License               | <http://bs2b.sourceforge.net> |
+| CSizingControlBar | -                         | <http://www.datamekanix.com/sizecbar/> |
+| LAV Filters       | GPLv2+                    | <https://github.com/Nevcairiel/LAVFilters> |
+| libdivide         | zlib License              | <http://libdivide.com/> |
+| Little CMS        | MIT License               | <http://www.littlecms.com/> |
 | Logitech SDK      | -                         | - |
-| MediaInfoLib      | Simplified BSD License    | https://mediaarea.net/MediaInfo |
-| Mhook             | MIT License               | https://github.com/martona/mhook |
-| MultiMon          | CPOL                      | http://www.codeproject.com/Articles/3690/ |
-| QuickTime SDK     | -                         | https://developer.apple.com/quicktime/ |
-| RARFileSource     | GPLv2+                    | http://www.v12pwr.com/RARFileSource/ |
+| MediaInfoLib      | Simplified BSD License    | <https://mediaarea.net/MediaInfo> |
+| Mhook             | MIT License               | <https://github.com/martona/mhook> |
+| MultiMon          | CPOL                      | <http://www.codeproject.com/Articles/3690/> |
+| NanoSVG           | zlib License              | <https://github.com/memononen/nanosvg> |
+| QuickTime SDK     | -                         | <https://developer.apple.com/quicktime/> |
+| RapidJSON         | MIT License               | <https://github.com/miloyip/rapidjson> |
+| RARFileSource     | GPLv2+                    | <http://www.v12pwr.com/RARFileSource/> |
 | RealMedia SDK     | -                         | - |
-| ResizableLib      | Artistic License          | https://sourceforge.net/projects/resizablelib/ |
-| sanear            | LGPLv2.1                  | https://github.com/alexmarsev/sanear |
-| Silk Icons        | CC Attribution 2.5        | http://www.famfamfam.com/lab/icons/silk/ |
-| SoundTouch        | LGPLv2.1                  | http://www.surina.net/soundtouch/ |
-| soxr              | LGPLv2.1+                 | https://sourceforge.net/projects/soxr/ |
-| TreePropSheet     | -                         | http://www.codeproject.com/Articles/3709/ |
-| UnRAR             | freeware                  | http://www.rarlab.com/rar_add.htm |
-| VirtualDub        | GPLv2+                    | http://www.virtualdub.org/ |
-| ZenLib            | zlib License              | https://sourceforge.net/projects/zenlib/ |
-| zita-resampler    | GPLv3                     | http://kokkinizita.linuxaudio.org/linuxaudio/ |
-| zlib              | zlib License              | http://zlib.net/ |
+| ResizableLib      | Artistic License          | <https://github.com/ppescher/resizablelib> |
+| sanear            | LGPLv2.1                  | <https://github.com/alexmarsev/sanear> |
+| Silk Icons        | CC Attribution 2.5        | <http://www.famfamfam.com/lab/icons/silk/> |
+| SoundTouch        | LGPLv2.1                  | <http://www.surina.net/soundtouch/> |
+| soxr              | LGPLv2.1+                 | <https://sourceforge.net/projects/soxr/> |
+| tinyxml2          | zlib License              | <http://www.grinninglizard.com/tinyxml2/> |
+| TreePropSheet     | -                         | <http://www.codeproject.com/Articles/3709/> |
+| UnRAR             | freeware                  | <http://www.rarlab.com/rar_add.htm> |
+| VirtualDub        | GPLv2+                    | <http://www.virtualdub.org/> |
+| XmlRpc4Win        | LGPLv2                    | <https://github.com/drtimcooper/XmlRpc4Win> |
+| ZenLib            | zlib License              | <https://github.com/MediaArea/ZenLib> |
+| zita-resampler    | GPLv3                     | <http://kokkinizita.linuxaudio.org/linuxaudio/> |
+| zlib              | zlib License              | <http://zlib.net/> |

build.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2009-2015 see Authors.txt
+REM (C) 2009-2016 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -42,7 +42,7 @@ FOR %%G IN (%ARG%) DO (
   IF /I "%%G" == "Win32"        SET "PPLATFORM=Win32"    & SET /A ARGPL+=1
   IF /I "%%G" == "x86"          SET "PPLATFORM=Win32"    & SET /A ARGPL+=1
   IF /I "%%G" == "x64"          SET "PPLATFORM=x64"      & SET /A ARGPL+=1
-  IF /I "%%G" == "All"          SET "CONFIG=All"         & SET /A ARGC+=1
+  IF /I "%%G" == "All"          SET "CONFIG=All"         & SET /A ARGC+=1  & SET "NO_LITE=True"
   IF /I "%%G" == "Main"         SET "CONFIG=Main"        & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_ZIP=True"
   IF /I "%%G" == "Filters"      SET "CONFIG=Filters"     & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_LITE=True"
   IF /I "%%G" == "Filter"       SET "CONFIG=Filters"     & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_LITE=True"
@@ -55,7 +55,7 @@ FOR %%G IN (%ARG%) DO (
   IF /I "%%G" == "Translations" SET "CONFIG=Translation" & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_ZIP=True" & SET "NO_LITE=True"
   IF /I "%%G" == "Debug"        SET "BUILDCFG=Debug"     & SET /A ARGBC+=1 & SET "NO_INST=True"
   IF /I "%%G" == "Release"      SET "BUILDCFG=Release"   & SET /A ARGBC+=1
-  IF /I "%%G" == "VS2013"       SET "COMPILER=VS2013"    & SET /A ARGCOMP+=1
+  IF /I "%%G" == "VS2015"       SET "COMPILER=VS2015"    & SET /A ARGCOMP+=1
   IF /I "%%G" == "Packages"     SET "PACKAGES=True"      & SET /A VALID+=1
   IF /I "%%G" == "Installer"    SET "INSTALLER=True"     & SET /A VALID+=1
   IF /I "%%G" == "7z"           SET "ZIP=True"           & SET /A VALID+=1
@@ -82,7 +82,7 @@ IF %ARGB%    GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGB% == 0    (SET "BUILDTY
 IF %ARGPL%   GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGPL% == 0   (SET "PPLATFORM=Both")
 IF %ARGC%    GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGC% == 0    (SET "CONFIG=MPCHC")
 IF %ARGBC%   GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGBC% == 0   (SET "BUILDCFG=Release")
-IF %ARGCOMP% GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGCOMP% == 0 (SET "COMPILER=VS2013")
+IF %ARGCOMP% GTR 1 (GOTO UnsupportedSwitch) ELSE IF %ARGCOMP% == 0 (SET "COMPILER=VS2015")
 
 IF /I "%PACKAGES%" == "True" SET "INSTALLER=True" & SET "ZIP=True"
 
@@ -91,8 +91,8 @@ IF /I "%ZIP%" == "True"         IF "%NO_ZIP%" == "True"  GOTO UnsupportedSwitch
 IF /I "%MPCHC_LITE%" == "True"  IF "%NO_LITE%" == "True" GOTO UnsupportedSwitch
 IF /I "%CLEAN%" == "LAVFilters" IF "%NO_LAV%" == "True"  GOTO UnsupportedSwitch
 
-IF NOT DEFINED VS120COMNTOOLS GOTO MissingVar
-SET "TOOLSET=%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
+IF NOT DEFINED VS140COMNTOOLS GOTO MissingVar
+SET "TOOLSET=%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
 SET "BIN_DIR=bin"
 
 IF EXIST "%FILE_DIR%signinfo.txt" (
@@ -477,14 +477,14 @@ EXIT /B
 TITLE %~nx0 Help
 ECHO.
 ECHO Usage:
-ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Main^|Resources^|MPCHC^|IconLib^|Translations^|Filters^|API^|All] [Debug^|Release] [Lite] [Packages^|Installer^|7z] [LAVFilters] [VS2013] [Analyze]
+ECHO %~nx0 [Clean^|Build^|Rebuild] [x86^|x64^|Both] [Main^|Resources^|MPCHC^|IconLib^|Translations^|Filters^|API^|All] [Debug^|Release] [Lite] [Packages^|Installer^|7z] [LAVFilters] [VS2015] [Analyze]
 ECHO.
 ECHO Notes: You can also prefix the commands with "-", "--" or "/".
 ECHO        Debug only applies to mpc-hc.sln.
 ECHO        The arguments are not case sensitive and can be ommitted.
 ECHO. & ECHO.
 ECHO Executing %~nx0 without any arguments will use the default ones:
-ECHO "%~nx0 Build Both MPCHC Release VS2013"
+ECHO "%~nx0 Build Both MPCHC Release VS2015"
 ECHO. & ECHO.
 ECHO Examples:
 ECHO %~nx0 x86 Resources     -Builds the x86 resources

build/BuildConfig.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>

contrib/astyle.ini

@@ -26,7 +26,6 @@
 --align-pointer=type --align-reference=type
 --close-templates
 --add-brackets
---keep-one-line-blocks
 --convert-tabs
 --lineend=windows --preserve-date
 --suffix=none

contrib/mpc-hc.cppcheck

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="1">
     <root name="."/>
+    <importproject>../mpc-hc.sln</importproject>
     <includedir>
         <dir name="include/"/>
     </includedir>
@@ -17,8 +18,6 @@
         <suppression>cstyleCast</suppression>
         <suppression>noExplicitConstructor</suppression>
         <suppression>redundantAssignment</suppression>
-        <suppression>unreadVariable</suppression>
-        <suppression>unusedPrivateFunction</suppression>
         <suppression>variableScope</suppression>
     </suppressions>
 </project>

contrib/run_astyle.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2012-2015 see Authors.txt
+REM (C) 2012-2016 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -30,7 +30,8 @@ CALL :SubCheckVer || GOTO End
 TITLE Running astyle using %FILE_DIR%astyle.ini
 
 IF "%~1" == "" (
-  astyle -r --options=astyle.ini ..\*.h ..\*.cpp
+  astyle -r --options=astyle.ini ..\*.cpp
+  astyle -r --options=astyle.ini --keep-one-line-blocks ..\*.h
 ) ELSE (
   FOR %%G IN (%*) DO astyle --options=astyle.ini %%G
 )

contrib/sign.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2013, 2015 see Authors.txt
+REM (C) 2013, 2015-2016 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -26,8 +26,8 @@ IF "%~1" == "" (
   GOTO END
 )
 
-IF NOT DEFINED VS120COMNTOOLS (
-  ECHO %~nx0: Visual Studio 2013 does not seem to be installed...
+IF NOT DEFINED VS140COMNTOOLS (
+  ECHO %~nx0: Visual Studio 2015 does not seem to be installed...
   SET SIGN_ERROR=True
   GOTO END
 )
@@ -38,35 +38,15 @@ IF NOT EXIST "%FILE_DIR%..\signinfo.txt" (
   GOTO END
 )
 
-SET SIGN_CMD=
-SET /P SIGN_CMD=<"%FILE_DIR%..\signinfo.txt"
-
-TITLE Signing "%~1"...
-ECHO. & ECHO Signing "%~1"...
-
-signtool /? 2>NUL || CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" 2>NUL
+signtool /? 2>NUL || CALL "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" 2>NUL
 IF %ERRORLEVEL% NEQ 0 (
   ECHO vcvarsall.bat call failed.
   GOTO End
 )
 
 REM Repeat n times when signing fails
 SET REPEAT=5
-SET TRY=0
-
-:SIGN
-signtool sign %SIGN_CMD% "%~1"
-SET /A TRY+=1
-IF %ERRORLEVEL% NEQ 0 (
-  IF TRY LSS REPEAT (
-    REM Wait 5 seconds before next try
-    PING -n 5 127.0.0.1 >NUL
-    GOTO SIGN
-  )
-  SET SIGN_ERROR=True
-  GOTO END
-)
-
+FOR /F "delims=" %%A IN (%FILE_DIR%..\signinfo.txt) DO (SET "SIGN_CMD=%%A" && CALL :START_SIGN %1)
 
 :END
 IF /I "%SIGN_ERROR%" == "True" (
@@ -76,3 +56,21 @@ IF /I "%SIGN_ERROR%" == "True" (
 )
 ENDLOCAL
 EXIT /B
+
+:START_SIGN
+IF /I "%SIGN_ERROR%" == "True" EXIT /B
+REM %1 is name of the file to sign
+TITLE Signing "%~1"...
+ECHO. & ECHO Signing "%~1"...
+SET TRY=0
+
+:SIGN
+SET /A TRY+=1
+signtool sign %SIGN_CMD% %1
+IF %ERRORLEVEL% EQU 0 EXIT /B
+IF %TRY% LSS %REPEAT% (
+  REM Wait 5 seconds before next try
+  PING -n 5 127.0.0.1 > NUL
+  GOTO SIGN
+)
+SET SIGN_ERROR=True