Skip to content

Commit

Permalink
Version 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Etienne Charland committed May 23, 2018
1 parent c1017bf commit d89f17b
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 27 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ x64/
build/
[Bb]in/
[Oo]bj/
.vs/


# Windows image file caches
Expand Down
6 changes: 4 additions & 2 deletions ExampleApplication/ExampleApplication.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EmergenceGuardian.FFmpegExampleApplication</RootNamespace>
<AssemblyName>ExampleApplication</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -118,7 +118,9 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.config" />
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
3 changes: 2 additions & 1 deletion ExampleApplication/FFmpegWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ private void FFmpeg_StatusUpdated(object sender, FFmpeg.StatusUpdatedEventArgs e
// Time left will be updated only 1 out of 2 to prevent changing too quick.
EstimatedTimeLeftToggle = !EstimatedTimeLeftToggle;
if (EstimatedTimeLeftToggle) {
TimeSpan TimeLeft = timeCalc?.Calculate(e.Status.Frame + host.Options.ResumePos) ?? TimeSpan.Zero;
timeCalc?.Calculate(e.Status.Frame + host.Options.ResumePos);
TimeSpan TimeLeft = timeCalc.ResultTimeLeft;
if (TimeLeft > TimeSpan.Zero)
TimeLeftText.Text = TimeLeft.ToString(TimeLeft.TotalHours < 1 ? "m\\:ss" : "h\\:mm\\:ss");
}
Expand Down
2 changes: 1 addition & 1 deletion ExampleApplication/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ namespace EmergenceGuardian.FFmpegExampleApplication {
public partial class MainWindow : Window {
public MainWindow() {
InitializeComponent();
FFmpegConfig.FFmpegPath = @"F:\AVSMeter\ffmpeg.exe";
FFmpegConfig.FFmpegPath = @"E:\AVSMeter\ffmpeg.exe";
FFmpegConfig.UserInterfaceManager = new FFmpegUserInterfaceManager(this);
}

Expand Down
2 changes: 1 addition & 1 deletion ExampleApplication/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ExampleApplication/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ExampleApplication/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
7 changes: 5 additions & 2 deletions FFmpeg.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2018
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFmpeg", "FFmpeg\FFmpeg.csproj", "{C01178B4-A869-45F8-9B2B-7683F9EBB53D}"
EndProject
Expand All @@ -25,4 +25,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4458AB03-25E7-41B4-8DFD-0F2DF8B6A3F5}
EndGlobalSection
EndGlobal
13 changes: 12 additions & 1 deletion FFmpeg/FFmpeg.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,18 @@

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>EmergenceGuardian.FFmpeg</PackageId>
<Version>1.1.0</Version>
<Authors>Etienne Charland</Authors>
<Company>Emergence Guardian</Company>
<Product>FFmpeg.NET</Product>
<Description>.NET Wrapper for FFmpeg</Description>
<Copyright>Copyright 2017-2018, Emergence Guardian</Copyright>
<PackageTags>ffmpeg ffmpeg-wrapper video-encoding video library .net</PackageTags>
<PackageReleaseNotes>https://github.com/mysteryx93/FFmpeg.NET/releases</PackageReleaseNotes>
<PackageProjectUrl>https://github.com/mysteryx93/FFmpeg.NET</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/mysteryx93/FFmpeg.NET/blob/master/LICENSE</PackageLicenseUrl>
</PropertyGroup>

</Project>
17 changes: 0 additions & 17 deletions FFmpeg/FFmpeg.nuspec

This file was deleted.

0 comments on commit d89f17b

Please sign in to comment.