Merge remote-tracking branch 'remotes/origin/MP1-4777-FEAT-Additional…

…_info_for_video_and_audio' into MP1-4745-Slow_down_playback_TEMP_to_resolve # Conflicts: # mediaportal/Core/Player/AudioPlayerWMP9.cs
MediaPortal · Mar 5, 2016 · b86a0f5 · b86a0f5
2 parents 63771f1 + 2378ffb
commit b86a0f5
Show file tree

Hide file tree

Showing 750 changed files with 151,144 additions and 9,953 deletions.
diff --git a/Common-MP-TVE3/SolutionInfo.cs b/Common-MP-TVE3/SolutionInfo.cs
@@ -51,8 +51,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
+[assembly: AssemblyVersion("1.13.100.0")]
+[assembly: AssemblyFileVersion("1.13.100.0")]
 
 //[assembly: AssemblyInformationalVersion("")]
 //[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
diff --git a/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh b/Tools/InstallationScripts/include/MediaPortalCurrentVersion.nsh
@@ -32,7 +32,7 @@
 
 !define VER_MAJOR       1
 !define VER_MINOR       13
-!define VER_REVISION    0
+!define VER_REVISION    100
 
 #**********************************************************************************************************#
 

diff --git a/Tools/MediaPortal.DeployTool/Utils.cs b/Tools/MediaPortal.DeployTool/Utils.cs
@@ -686,8 +686,8 @@ public static Version GetPackageVersion(string type)
           break;
         case "max":
           major = 1;
-          minor = 12;
-          revision = 100;
+          minor = 13;
+          revision = 0;
           break;
       }
       Version ver = new Version(major, minor, revision);
@@ -708,7 +708,7 @@ public static Version GetCurrentPackageVersion()
     {
       int major = 1;
       int minor = 13;
-      int revision = 0;
+      int revision = 100;
 
       Version ver = new Version(major, minor, revision);
       return ver;
@@ -781,7 +781,7 @@ public static Version VersionFromRegistry(string regkey)
 
     public static string GetDisplayVersion()
     {
-      return "1.13.0";
+      return "1.14.0 Pre Release";
     }
 
     /// <summary>

diff --git a/TvEngine3/TVLibrary/Setup/setup.nsi b/TvEngine3/TVLibrary/Setup/setup.nsi
@@ -493,7 +493,10 @@ ${MementoSection} "MediaPortal TV Server" SecServer
   File "${TVSERVER.BASE}\Ionic.Zip.dll"
 
   ; MediaInfo
-  File "${TVSERVER.BASE}\MediaInfo.dll"
+  File "${git_ROOT}\Packages\MP-1-MediaInfolib.1.0.1\MediaInfo.dll"
+  File "${git_ROOT}\Packages\MP-1-MediaInfolib.1.0.1\libcurl.dll"
+  File "${git_ROOT}\Packages\MP-1-MediaInfolib.1.0.1\libeay32.dll"
+  File "${git_ROOT}\Packages\MP-1-MediaInfolib.1.0.1\ssleay32.dll"
 
   ; thumbnail software
   File "${git_ROOT}\Packages\ffmpeg.2.7.1\ffmpeg.exe"

diff --git a/TvEngine3/TVLibrary/TVServer.Base/MediaInfo.dll b/TvEngine3/TVLibrary/TVServer.Base/MediaInfo.dll
diff --git a/TvEngine3/TVLibrary/TvService/PostBuild.bat b/TvEngine3/TVLibrary/TvService/PostBuild.bat
@@ -20,4 +20,9 @@ xcopy %1\SetupControls\bin\%2\*.* . /R /Y /D
 xcopy %1\..\..\DirectShowFilters\StreamingServer\bin\%2\*.* . /R /Y /D
 xcopy %1\..\..\DirectShowFilters\DXErr9\bin\%2\*.* . /R /Y /D
 xcopy %1\SetupTv\bin\%2\SetupTv.* . /R /Y /D
-xcopy %1\TvLibrary.Utils\bin\%2\*.* /R /Y /D
+xcopy %1\TvLibrary.Utils\bin\%2\*.* /R /Y /D
+rem MediaInfo
+xcopy %1\..\..\Packages\MP-1-MediaInfolib.1.0.1\MediaInfo.dll . /R /Y /D
+xcopy %1\..\..\Packages\MP-1-MediaInfolib.1.0.1\libcurl.dll . /R /Y /D
+xcopy %1\..\..\Packages\MP-1-MediaInfolib.1.0.1\libeay32.dll . /R /Y /D
+xcopy %1\..\..\Packages\MP-1-MediaInfolib.1.0.1\ssleay32.dll . /R /Y /D
diff --git a/TvEngine3/TVLibrary/TvService/TvService.csproj b/TvEngine3/TVLibrary/TvService/TvService.csproj
@@ -26,6 +26,7 @@
     <ApplicationManifest>TvService.exe.manifest</ApplicationManifest>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -209,6 +210,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="TvService.exe.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -220,4 +224,11 @@
   <PropertyGroup>
     <PostBuildEvent>"$(ProjectDir)PostBuild.bat" "$(SolutionDir)" $(ConfigurationName)</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
 </Project>
diff --git a/TvEngine3/TVLibrary/TvService/packages.config b/TvEngine3/TVLibrary/TvService/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MP-1-MediaInfolib" version="1.0.1"/>
+</packages>