Merge branch 'release-1.7.8'

CONTRIBUTING.md

@@ -6,8 +6,8 @@
    [OpenID authentication](https://trac.mpc-hc.org/openidlogin) is available).
 2. Please search our [Trac](https://trac.mpc-hc.org/report/1)
    for your problem since there's a good chance that someone has already reported it.
-3. In case you found a match, please try to provide as much info as you can
-   so we have better picture about what the real problem is and how to fix it ASAP.
+3. If you find a match, please try to provide as much info as you can,
+   so that we have a better picture about what the real problem is and how to fix it ASAP.
 4. If you didn't find any tickets with a problem similar to yours then please open a
    [new ticket](https://trac.mpc-hc.org/ticket/newticket)
    * Be descriptive as much as you can
@@ -19,7 +19,7 @@ If you want to help, here's what you need to do:
 
 1. Make sure you have a [GitHub account](https://github.com/signup/free).
 2. [Fork](https://github.com/mpc-hc/mpc-hc/fork) our repository.
-3. Create a new topic branch to contain your feature, change, or fix.
+3. Create a new topic branch (based on the `develop` branch) to contain your feature, change, or fix.
 4. Set `core.autocrlf` to true: `git config core.autocrlf true`.
 5. Make sure you have enabled the pre-commit hook - **[pre-commit.sh](/contrib/pre-commit.sh)**.
 6. Make sure that your changes adhere to the current coding conventions used

Readme.md

@@ -6,7 +6,7 @@
 
 Media Player Classic - Home Cinema (MPC-HC) is a free and open source (OSS) video
 and audio player for Windows. MPC-HC is based on the original Guliverkli project
-and contains a lot of additional features and bug fixes.
+and contains many additional features and bug fixes.
 
 We are in dire need of new developers of any kind. If you can code a little, or you can create
 logos for the player and images for the file associations, or you can create/maintain the main
@@ -31,7 +31,7 @@ See [CONTRIBUTING.md](/CONTRIBUTING.md) for more info.
 * Multi-Monitor support
 * Various [pixel shaders](http://en.wikipedia.org/wiki/Shader#Pixel_shaders)
 * [Color management](http://en.wikipedia.org/wiki/Color_management)
-* 35 translations available
+* 37 translations available
 
 
 ## System Requirements:

build.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2009-2014 see Authors.txt
+REM (C) 2009-2015 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -59,7 +59,7 @@ FOR %%G IN (%ARG%) DO (
   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" == "Main"         SET "CONFIG=Main"        & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_ZIP=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"
   IF /I "%%G" == "API"          SET "CONFIG=API"         & SET /A ARGC+=1  & SET "NO_INST=True" & SET "NO_ZIP=True" & SET "NO_LITE=True"
@@ -282,10 +282,11 @@ IF %ERRORLEVEL% NEQ 0 EXIT /B
 
 FOR %%G IN (
  "Arabic" "Armenian" "Basque" "Belarusian" "Bengali" "Catalan" "Chinese Simplified"
- "Chinese Traditional" "Croatian" "Czech" "Dutch" "English (British)" "French"
- "Galician" "German" "Greek" "Hebrew" "Hungarian" "Italian" "Japanese" "Korean"
- "Malay" "Polish" "Portuguese (Brazil)" "Romanian" "Russian" "Slovak" "Slovenian"
- "Spanish" "Swedish" "Tatar" "Thai" "Turkish" "Ukrainian" "Vietnamese"
+ "Chinese Traditional" "Croatian" "Czech" "Dutch" "English (British)" "Finnish"
+ "French" "Galician" "German" "Greek" "Hebrew" "Hungarian" "Italian" "Japanese"
+ "Korean" "Malay" "Polish" "Portuguese (Brazil)" "Romanian" "Russian" "Serbian"
+ "Slovak" "Slovenian" "Spanish" "Swedish" "Tatar" "Thai" "Turkish" "Ukrainian"
+ "Vietnamese"
 ) DO (
  TITLE Compiling mpcresources %COMPILER% - %%~G^|%1...
  MSBuild.exe mpcresources.sln %MSBUILD_SWITCHES%^
@@ -356,7 +357,7 @@ IF /I "%~1" == "x64" (
 IF DEFINED MPCHC_LITE (
   SET MPCHC_INNO_DEF=%MPCHC_INNO_DEF% /DMPCHC_LITE
   SET MPCHC_COPY_DX_DLL_ARGS=%MPCHC_COPY_DX_DLL_ARGS% " Lite"
-) 
+)
 
 CALL :SubCopyDXDll %MPCHC_COPY_DX_DLL_ARGS%
 
@@ -396,7 +397,7 @@ IF /I "%~2" == "Win32" (
 
 IF DEFINED MPCHC_LITE (
   CALL :SubCopyDXDll %ARCH% " Lite"
-) ELSE (
+) ELSE IF /I "%NAME%" == "MPC-HC" (
   CALL :SubCopyDXDll %ARCH%
 )
 
@@ -424,7 +425,8 @@ REM Compress the pdb file for mpc-hc only
 IF /I "%NAME%" == "MPC-HC" (
   PUSHD "%VS_OUT_DIR%"
   TITLE Creating archive %PCKG_NAME%.pdb.7z...
-  START "7z" /B /WAIT "%SEVENZIP%" a -t7z "%PCKG_NAME%.pdb.7z" %PDB_FILES% -m0=LZMA -mx9 -ms=on
+  START "7z" /B /WAIT "%SEVENZIP%" a -t7z "%PCKG_NAME%.pdb.7z" %PDB_FILES% -m0=LZMA2^
+   -mmt=%NUMBER_OF_PROCESSORS% -mx9 -ms=on
   IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Unable to create %PCKG_NAME%.pdb.7z!" & EXIT /B
   CALL :SubMsg "INFO" "%PCKG_NAME%.pdb.7z successfully created"
   IF EXIST "%PCKG_NAME%.pdb.7z" MOVE /Y "%PCKG_NAME%.pdb.7z" ".." >NUL
@@ -469,8 +471,8 @@ COPY /Y /V "..\docs\Changelog.txt"  "%PCKG_NAME%" >NUL
 COPY /Y /V "..\docs\Readme.txt"     "%PCKG_NAME%" >NUL
 
 TITLE Creating archive %PCKG_NAME%.7z...
-START "7z" /B /WAIT "%SEVENZIP%" a -t7z "%PCKG_NAME%.7z" "%PCKG_NAME%"^
- -m0=LZMA -mx9 -ms=on
+START "7z" /B /WAIT "%SEVENZIP%" a -t7z "%PCKG_NAME%.7z" "%PCKG_NAME%" -m0=LZMA2^
+ -mmt=%NUMBER_OF_PROCESSORS% -mx9 -ms=on
 IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Unable to create %PCKG_NAME%.7z!" & EXIT /B
 CALL :SubMsg "INFO" "%PCKG_NAME%.7z successfully created"
 
@@ -481,6 +483,7 @@ EXIT /B
 
 
 :SubGetVersion
+PUSHD %~dp0
 REM Get the version
 IF NOT EXIST "include\version_rev.h" SET "FORCE_VER_UPDATE=True"
 IF /I "%FORCE_VER_UPDATE%" == "True" CALL "update_version.bat" && SET "FORCE_VER_UPDATE=False"
@@ -505,6 +508,7 @@ IF "%MPCHC_NIGHTLY%" NEQ "0" (
 ) ELSE (
   SET "MPCHC_VER=%MPC_VERSION_MAJOR%.%MPC_VERSION_MINOR%.%MPC_VERSION_PATCH%"
 )
+POPD
 EXIT /B
 
 

contrib/astyle.ini

@@ -20,6 +20,7 @@
 --indent=spaces=4 --style=kr
 --indent-switches --indent-namespaces --indent-col1-comments
 #--indent-preproc-cond
+--max-instatement-indent=65
 --attach-inlines
 --pad-header --pad-oper --unpad-paren
 --align-pointer=type --align-reference=type

contrib/coverity.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2013-2014 see Authors.txt
+REM (C) 2013-2015 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -21,10 +21,12 @@ SETLOCAL
 
 PUSHD %~dp0
 
-IF NOT DEFINED COVDIR SET "COVDIR=H:\progs\thirdparty\cov-analysis-win64-7.5.0"
-IF DEFINED COVDIR IF NOT EXIST "%COVDIR%" (
+IF EXIST "..\build.user.bat" CALL "..\build.user.bat"
+
+IF NOT DEFINED COV_PATH SET "COV_PATH=H:\progs\thirdparty\cov-analysis-win64"
+IF DEFINED COV_PATH IF NOT EXIST "%COV_PATH%" (
   ECHO.
-  ECHO ERROR: Coverity not found in "%COVDIR%"
+  ECHO ERROR: Coverity not found in "%COV_PATH%"
   GOTO End
 )
 
@@ -48,16 +50,16 @@ CALL "..\build.bat" clean Lite Both Main Release silent
 CALL "..\build.bat" clean Filters Both Release silent
 CALL "..\build.bat" clean IconLib Both Release silent
 CALL "..\build.bat" clean Api Both Release silent
-"%COVDIR%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Lite Both Main Release silent
-"%COVDIR%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Filters Both Release silent
-"%COVDIR%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build IconLib Both Release silent
-"%COVDIR%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Api Both Release silent
+"%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Lite Both Main Release silent
+"%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Filters Both Release silent
+"%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build IconLib Both Release silent
+"%COV_PATH%\bin\cov-build.exe" --dir cov-int "..\build.bat" Build Api Both Release silent
 
 
 :tar
 tar --version 1>&2 2>NUL || (ECHO. & ECHO ERROR: tar not found & GOTO SevenZip)
 tar caf "MPC-HC.lzma" "cov-int"
-GOTO End
+GOTO Upload
 
 
 :SevenZip
@@ -69,10 +71,17 @@ IF EXIST "%SEVENZIP%" (
   "%SEVENZIP%" a -ttar "MPC-HC.tar" "cov-int"
   "%SEVENZIP%" a -tgzip "MPC-HC.tgz" "MPC-HC.tar"
   IF EXIST "MPC-HC.tar" DEL "MPC-HC.tar"
-  GOTO End
+  GOTO Upload
 )
 
 
+:Upload
+CALL "..\build.bat" GetVersion
+CALL :SubDetectCurl
+%CURL% --form project=MPC-HC --form token=%COV_TOKEN% --form email=%COV_EMAIL% --form file=@MPC-HC.lzma --form version=%MPCHC_HASH% http://scan5.coverity.com/cgi-bin/upload.py
+GOTO End
+
+
 :SubDetectSevenzipPath
 FOR %%G IN (7z.exe) DO (SET "SEVENZIP_PATH=%%~$PATH:G")
 IF EXIST "%SEVENZIP_PATH%" (SET "SEVENZIP=%SEVENZIP_PATH%" & EXIT /B)
@@ -86,6 +95,14 @@ FOR /F "tokens=2*" %%A IN (
 EXIT /B
 
 
+:SubDetectCurl
+IF EXIST curl.exe (SET "CURL=curl.exe" & EXIT /B)
+IF EXIST "%CURL_PATH%\curl.exe" (SET "CURL=%CURL_PATH%\curl.exe" & EXIT /B)
+FOR %%G IN (curl.exe) DO (SET "CURL_PATH=%%~$PATH:G")
+IF EXIST "%CURL_PATH%" (SET "CURL=%CURL_PATH%" & EXIT /B)
+EXIT /B
+
+
 :End
 POPD
 ECHO. & ECHO Press any key to close this window...

contrib/pre-commit.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# (C) 2013-2014 see Authors.txt
+# (C) 2013-2015 see Authors.txt
 #
 # This file is part of MPC-HC.
 #
@@ -35,12 +35,12 @@ astyle_ignore_excluded=y
 astyle_ignore_stashed=n
 
 # internal variables
-versioncheck_version=4
+versioncheck_version=6
 versioncheck_path=contrib/pre-commit.sh
 astyle_config=contrib/astyle.ini
 astyle_extensions=(cpp h)
-astyle_version='Artistic Style Version 2.04'
-checkyear_extensions=(bat cpp h hlsl iss py sh)
+astyle_version='Artistic Style Version 2.05.1'
+checkyear_extensions=(bat cpp h hlsl iss po py sh)
 checkyear_pattern1='\(C\) (([0-9][0-9][0-9][0-9]-)?[0-9][0-9][0-9][0-9](, )?)+ see Authors.txt'
 year=$(date +%Y)
 checkyear_pattern2=''"$year"' see Authors.txt'

contrib/run_astyle.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-REM (C) 2012-2013 see Authors.txt
+REM (C) 2012-2014 see Authors.txt
 REM
 REM This file is part of MPC-HC.
 REM
@@ -21,7 +21,7 @@ SETLOCAL
 
 PUSHD %~dp0
 
-SET "AStyleVerMin=2.04"
+SET "AStyleVerReq=2.05.1"
 astyle --version 2>NUL || (ECHO. & ECHO ERROR: AStyle not found & GOTO End)
 CALL :SubCheckVer || GOTO End
 
@@ -52,8 +52,8 @@ FOR /F "tokens=4 delims= " %%A IN ('astyle --version 2^>^&1 NUL') DO (
   SET "AStyleVer=%%A"
 )
 
-IF %AStyleVer% LSS %AStyleVerMin% (
-  ECHO. & ECHO ERROR: AStyle v%AStyleVer% is too old, please update AStyle to v%AStyleVerMin% or newer.
+IF %AStyleVer% NEQ %AStyleVerReq% (
+  ECHO. & ECHO ERROR: AStyle v%AStyleVerReq% is required.
   EXIT /B 1
 )
 EXIT /B

distrib/Languages/Arabic.isl

@@ -1,7 +1,6 @@
 ; *** Inno Setup version 5.5.3+ Arabic messages ***
 ;
-; Translated by Ahmad Alani ([email protected])
-; To download user-contributed translations of this file, go to:
+; Translated by Awadh Al-Ghaamdi ([email protected])
 ;   http://www.jrsoftware.org/files/istrans/
 ;
 ; Note: When translating this text, do not add periods (.) to the end of
@@ -70,8 +69,8 @@ ErrorTooManyFilesInDir=
 
 ; *** Setup common messages
 ExitSetupTitle=إنهاء عملية التثبيت
-ExitSetupMessage=.عملية التثبيت لم تكتمل. إذا خرجت الآن فان البرنامج لن يتم تثبيته%n%nيمكنك تشغيل برنامج التثبيت لاحقا .لأستكمال العملية%n%nهل تريد الخروج ؟
-AboutSetupMenuItem=...&حول برنامج التثبيت
+ExitSetupMessage=عملية التثبيت لم تكتمل. إذا خرجت الآن فان البرنامج لن يتم تثبيته.%n%nيمكنك تشغيل برنامج التثبيت لاحقا لاستكمال العملية.%n%nهل تريد الخروج؟
+AboutSetupMenuItem=&حول برنامج التثبيت...
 AboutSetupTitle=حول برنامج التثبيت
 AboutSetupMessage=%1 إصدار %2%n%3%n%n%1 الموقع على الإنترنت:%n%4
 AboutSetupNote=
@@ -97,7 +96,7 @@ SelectLanguageTitle=
 SelectLanguageLabel=حدد اللغة المستخدمة أثناء التثبيت:
 
 ; *** Common wizard text
-ClickNext=اضغط التالي للمواصلة ، أو إلغاء الأمر للخروج%n%nترجمة : أحـمـد الـعـانــي
+ClickNext=اضغط التالي للمواصلة ، أو إلغاء الأمر للخروج%n%nترجمة الأستاذ عوض الغامدي
 BeveledLabel=
 BrowseDialogTitle=تصفح عن مجلد
 BrowseDialogLabel=حدد مجلدا ما في القائمة تحت , ثم إضغط حسنا
@@ -208,7 +207,7 @@ ApplicationsFound=
 ApplicationsFound2=التطبيقات التالية تستخدم ملفات بحاجة إلى تحديثها بواسطة برنامج التثبيت. يستحسن السماح لبرنامج التثبيت بإغلاق هذه التطبيقات تلقائيا و بعد اكتمال عملية التثبيت، سيحاول برنامج التثبيت إعادة تشغيل التطبيقات
 CloseApplications=إ&غلاق التطبيقات تلقائيا
 DontCloseApplications=&غدم إغلاق التطبيقات
-ErrorCloseApplications=لم يتمكن الإعداد تلقائياً بإغلاق كافة التطبيقات. من المستحسن أن تقوم بإغلاق كافة التطبيقات التي تستخدم .الملفات التي تحتاج إلى تحديث بواسطة الإعداد قبل المتابعة
+ErrorCloseApplications=لم يتمكن برنامج الإعداد تلقائيا من إغلاق كافة التطبيقات. من المستحسن أن تقوم أنت بإغلاق كافة التطبيقات التي تستخدم الملفات المطلوب تحديثها بواسطة برنامج الإعداد قبل المتابعة
 
 ; *** "Installing" wizard page
 WizardInstalling=تتم عملية التثبيت
@@ -227,7 +226,7 @@ NoRadio=&
 ; used for example as 'Run MyProg.exe'
 RunEntryExec=تشغيل %1
 ; used for example as 'View Readme.txt'
-RunEntryShellExec=اعرض %1
+RunEntryShellExec=عرض %1
 
 ; *** "Setup Needs the Next Disk" stuff
 ChangeDiskTitle=برنامج التثبيت يحتاج القرص التالي

distrib/Languages/Croatian.isl

@@ -145,7 +145,7 @@ SelectDirLabel3=Instalacija 
 SelectDirBrowseLabel=Za nastavak kliknite na Nastavak. Ako želite odabrati drugu mapu kliknite na Odaberi.
 DiskSpaceMBLabel=Ovaj program zahtjeva minimalno [mb] MB slobodnog prostora na disku.
 CannotInstallToNetworkDrive=Instalacija ne može instalirati na mrežnu jedinicu.
-CannotInstallToUNCPathname=Instalacija ne može instalirati na UNC putanju.
+CannotInstallToUNCPath=Instalacija ne može instalirati na UNC putanju.
 InvalidPath=Morate unijeti punu stazu zajedno sa slovom diska (npr.%n%nC:\APP%n%nili stazu u obliku%n%n\\server\share)
 InvalidDrive=Disk koji ste odabrali ne postoji. Odaberite neki drugi.
 DiskSpaceWarningTitle=Nedovoljno prostora na disku
@@ -325,6 +325,7 @@ ShutdownBlockReasonUninstallingApp=Deinstaliram %1.
 ; use of them in your scripts, you'll want to translate them.
 
 [CustomMessages]
+
 NameAndVersion=%1 verzija %2
 AdditionalIcons=Dodatne ikone:
 CreateDesktopIcon=Kreiraj ikonu na &Desktopu