Skip to content

Commit

Permalink
FFMSsharp -> FFMSSharp
Browse files Browse the repository at this point in the history
The result of another Code Analysis pass.
  • Loading branch information
nixxquality committed May 2, 2014
1 parent 123f593 commit 52744ad
Show file tree
Hide file tree
Showing 16 changed files with 403 additions and 383 deletions.
4 changes: 2 additions & 2 deletions FFMSsharp.sln → FFMSSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSsharp", "FFMSsharp\FFMSsharp.csproj", "{303CA7DC-1B7E-45BE-9A90-A37D72CE4791}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSSharp", "FFMSsharp\FFMSSharp.csproj", "{303CA7DC-1B7E-45BE-9A90-A37D72CE4791}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSsharp.Tests", "FFMSsharp.Tests\FFMSsharp.Tests.csproj", "{04F8F954-CEF5-4E80-B134-68C99584B338}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFMSSharp.Tests", "FFMSsharp.Tests\FFMSSharp.Tests.csproj", "{04F8F954-CEF5-4E80-B134-68C99584B338}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
4 changes: 2 additions & 2 deletions FFMSsharp.Tests/FFMSsharp.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FFMSsharp\FFMSsharp.csproj">
<ProjectReference Include="..\FFMSsharp\FFMSSharp.csproj">
<Project>{303ca7dc-1b7e-45be-9a90-a37d72ce4791}</Project>
<Name>FFMSsharp</Name>
<Name>FFMSSharp</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions FFMSsharp.Tests/UnitTest1.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using FFMSsharp;
using FFMSSharp;
using System.Drawing;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -41,7 +41,7 @@ public void IndexerMatroska()
Indexer indexer = new Indexer("h264_720p_hp_5.1_3mbps_vorbis_styled_and_unstyled_subs_suzumiya.mkv");

Assert.AreEqual(5, indexer.NumberOfTracks);
Assert.AreEqual(FFMSsharp.TrackType.Video, indexer.GetTrackType(0));
Assert.AreEqual(FFMSSharp.TrackType.Video, indexer.GetTrackType(0));
Assert.AreEqual("matroska", indexer.FormatName);
Assert.AreEqual("h264", indexer.GetCodecName(0));
}
Expand Down
8 changes: 4 additions & 4 deletions FFMSsharp/AudioSource.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Runtime.InteropServices;

namespace FFMSsharp
namespace FFMSSharp
{
#region Interop

Expand Down Expand Up @@ -325,7 +325,7 @@ public double FirstTime
public double LastTime
{ get { return AP.LastTime; } }

FFMSsharp.Track track;
FFMSSharp.Track track;
/// <summary>
/// Retrieves track info
/// </summary>
Expand All @@ -342,7 +342,7 @@ public Track Track
{
IntPtr trackPtr = IntPtr.Zero;
trackPtr = NativeMethods.FFMS_GetTrackFromAudio(FFMS_AudioSource);
track = new FFMSsharp.Track(trackPtr);
track = new FFMSSharp.Track(trackPtr);
}
return track;
}
Expand Down Expand Up @@ -416,7 +416,7 @@ public byte[] GetAudio(long start, long count)
if (err.ErrorType == FFMS_Errors.FFMS_ERROR_SEEKING && err.SubType == FFMS_Errors.FFMS_ERROR_CODEC)
throw new NotSupportedException(err.Buffer);

throw new NotImplementedException(string.Format(System.Globalization.CultureInfo.CurrentCulture, "Unknown FFMS2 error encountered: ({0}, {1}, '{2}'). Please report this issue on FFMSsharp's GitHub.", err.ErrorType, err.SubType, err.Buffer));
throw new NotImplementedException(string.Format(System.Globalization.CultureInfo.CurrentCulture, "Unknown FFMS2 error encountered: ({0}, {1}, '{2}'). Please report this issue on FFMSSharp's GitHub.", err.ErrorType, err.SubType, err.Buffer));
}

return buffer;
Expand Down
17 changes: 17 additions & 0 deletions FFMSsharp/CustomDictionary.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Dictionary>
<Words>
<Recognized>
<Word>FFMS2</Word>
<Word>GitHub</Word>
<Word>timecode</Word>
<Word>timecodes</Word>
<Word>demuxer</Word>
<Word>FFMSSharp's</Word>
</Recognized>
</Words>
<Acronyms>
<CasingExceptions>
<Acronym>FFMS</Acronym>
</CasingExceptions>
</Acronyms>
</Dictionary>
2 changes: 1 addition & 1 deletion FFMSsharp/FFMS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Runtime.InteropServices;

[assembly: CLSCompliant(false)]
namespace FFMSsharp
namespace FFMSSharp
{
#region Interop

Expand Down
7 changes: 5 additions & 2 deletions FFMSsharp/FFMSsharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{303CA7DC-1B7E-45BE-9A90-A37D72CE4791}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FFMSsharp</RootNamespace>
<AssemblyName>FFMSsharp</AssemblyName>
<RootNamespace>FFMSSharp</RootNamespace>
<AssemblyName>FFMSSharp</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
Expand Down Expand Up @@ -55,6 +55,9 @@
<Compile Include="VideoSource.cs" />
<Compile Include="FFMS.cs" />
</ItemGroup>
<ItemGroup>
<CodeAnalysisDictionary Include="CustomDictionary.xml" />
</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.
Expand Down
Loading

0 comments on commit 52744ad

Please sign in to comment.