CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Move FFmpegDownloader to MediaLib

Browse source
This commit is contained in:
Jaex 2016-08-27 19:51:20 +03:00
parent d0cd08b222
commit e91a916677
7 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -70,10 +70,6 @@
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
<HintPath>..\packages\SevenZipSharp.0.64\lib\SevenZipSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Design" />
@ -166,7 +162,6 @@
<Compile Include="CLI\ExternalCLIManager.cs" />
<Compile Include="EnumInfo.cs" />
<Compile Include="Extensions\NumberExtensions.cs" />
<Compile Include="FFmpegDownloader.cs" />
<Compile Include="FontSafe.cs" />
<Compile Include="Forms\OutputBox.cs">
<SubType>Form</SubType>

1
ShareX.HelpersLib/packages.config
View file

@ -2,5 +2,4 @@
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net40" />
<package id="QrCode.Net" version="0.4.0.0" targetFramework="net40" />
<package id="SevenZipSharp" version="0.64" targetFramework="net40" />
</packages>

7
ShareX.HelpersLib/FFmpegDownloader.cs → ShareX.MediaLib/FFmpegDownloader.cs
View file

@ -24,12 +24,13 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using SevenZip;
using ShareX.HelpersLib;
using System;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows.Forms;
namespace ShareX.HelpersLib
namespace ShareX.MediaLib
{
public static class FFmpegDownloader
{
@ -62,11 +63,11 @@ public static bool ExtractFFmpeg(string zipPath, string extractPath)
{
if (NativeMethods.Is64Bit())
{
SevenZipExtractor.SetLibraryPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "7z-x64.dll"));
SevenZipBase.SetLibraryPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "7z-x64.dll"));
}
else
{
SevenZipExtractor.SetLibraryPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "7z.dll"));
SevenZipBase.SetLibraryPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "7z.dll"));
}
Helpers.CreateDirectoryFromFilePath(extractPath);

8
ShareX.MediaLib/ShareX.MediaLib.csproj
View file

@ -41,6 +41,10 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
<HintPath>..\packages\SevenZipSharp.0.64\lib\SevenZipSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Design" />
@ -55,6 +59,7 @@
<ItemGroup>
<Compile Include="Enums.cs" />
<Compile Include="FFmpegCLIManager.cs" />
<Compile Include="FFmpegDownloader.cs" />
<Compile Include="Forms\VideoThumbnailerForm.cs">
<SubType>Form</SubType>
</Compile>
@ -119,6 +124,9 @@
<EmbeddedResource Include="Properties\Resources.vi-VN.resx" />
<EmbeddedResource Include="Properties\Resources.zh-CN.resx" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\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.

4
ShareX.MediaLib/packages.config Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SevenZipSharp" version="0.64" targetFramework="net40" />
</packages>

1
ShareX.ScreenCaptureLib/Screencast/FFmpegOptionsForm.cs
View file

@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using ShareX.MediaLib;
using ShareX.ScreenCaptureLib.Properties;
using System;
using System.Diagnostics;

4
ShareX.ScreenCaptureLib/ShareX.ScreenCaptureLib.csproj
View file

@ -161,6 +161,10 @@
<Project>{327750E1-9FB7-4CC3-8AEA-9BC42180CAD3}</Project>
<Name>ShareX.HelpersLib</Name>
</ProjectReference>
<ProjectReference Include="..\ShareX.MediaLib\ShareX.MediaLib.csproj">
<Project>{1a190e53-1419-4cc2-b0e5-3bc7ea861c8b}</Project>
<Name>ShareX.MediaLib</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\image.png" />