Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ bin/
obj/
TestResults/
Build/
/Source/.vs/Zencoder/v15/Server/sqlite3
27 changes: 27 additions & 0 deletions Source/Package.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>NS.Zencoder</id>
<version>$version$</version>
<title>Zencoder</title>
<authors>Akash Kava</authors>
<owners>Akash Kava</owners>
<licenseUrl>https://github.com/ackava/zencoder-cs/blob/master/LICENSE.txt</licenseUrl>
<projectUrl>https://github.com/ackava/zencoder-cs</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>
Zencoder
</description>
<summary>
Zencoder
</summary>
<releaseNotes>
</releaseNotes>
<copyright>NeuroSpeech Technologies Pvt Ltd 2016</copyright>
<language>en-US</language>
<tags>zencoder</tags>
</metadata>
<files>
<file src="Zencoder\bin\Debug\Zencoder.*" target="lib\net40" />
</files>
</package>
20 changes: 10 additions & 10 deletions Source/Zencoder.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
# Visual Studio 15
VisualStudioVersion = 15.0.28307.168
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3F3CE0C5-A66D-4468-BEF8-CABB6B8DA6D1}"
ProjectSection(SolutionItems) = preProject
..\build.proj = ..\build.proj
..\LICENSE.txt = ..\LICENSE.txt
LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
Package.nuspec = Package.nuspec
..\README.md = ..\README.md
SolutionInfo.cs = SolutionInfo.cs
Web.config.template = Web.config.template
Expand All @@ -14,12 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zencoder", "Zencoder\Zencoder.csproj", "{6E47D2CE-D094-4077-9039-3B257DED1C6E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zencoder.Test", "Zencoder.Test\Zencoder.Test.csproj", "{56CB9652-A906-4B54-8D67-70C1DE36EB3D}"
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = Zencoder.vsmdi
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Expand All @@ -29,12 +27,14 @@ Global
{6E47D2CE-D094-4077-9039-3B257DED1C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E47D2CE-D094-4077-9039-3B257DED1C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E47D2CE-D094-4077-9039-3B257DED1C6E}.Release|Any CPU.Build.0 = Release|Any CPU
{56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB1BC2D1-5E33-4FBF-95B2-6836B947604B}
EndGlobalSection
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = Zencoder.vsmdi
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion Source/Zencoder/CreateJobResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class CreateJobResponse : Response<CreateJobRequest, CreateJobResponse>
/// </summary>
[JsonProperty("id")]
[JsonConverter(typeof(DefaultingIntegerConverter))]
public int Id { get; set; }
public long Id { get; set; }

/// <summary>
/// Gets or sets the response output collection.
Expand Down
2 changes: 1 addition & 1 deletion Source/Zencoder/HttpPostNotificationJob.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class HttpPostNotificationJob
/// Gets or sets the job ID.
/// </summary>
[JsonProperty("id")]
public int Id { get; set; }
public long Id { get; set; }

/// <summary>
/// Gets or sets the job state.
Expand Down
2 changes: 1 addition & 1 deletion Source/Zencoder/HttpPostNotificationOutput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class HttpPostNotificationOutput
/// Gets or sets the output's ID.
/// </summary>
[JsonProperty("id")]
public int Id { get; set; }
public long Id { get; set; }

/// <summary>
/// Gets or sets the output's label, if applicable.
Expand Down
2 changes: 1 addition & 1 deletion Source/Zencoder/Job.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class Job
/// Gets or sets the job ID.
/// </summary>
[JsonProperty("id")]
public int Id { get; set; }
public long Id { get; set; }

/// <summary>
/// Gets or sets the job's input media file.
Expand Down
2 changes: 1 addition & 1 deletion Source/Zencoder/JobDetailsRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public JobDetailsRequest(string apiKey, Uri baseUrl)
/// <summary>
/// Gets or sets the ID of the job to get details for.
/// </summary>
public int JobId { get; set; }
public long JobId { get; set; }

/// <summary>
/// Gets the concrete URL this request will call.
Expand Down
2 changes: 1 addition & 1 deletion Source/Zencoder/MediaFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public abstract class MediaFile
/// Gets or sets the file's ID.
/// </summary>
[JsonProperty("id")]
public int Id { get; set; }
public long Id { get; set; }

/// <summary>
/// Gets or sets the file's total bitrate (in Kbps).
Expand Down
2 changes: 1 addition & 1 deletion Source/Zencoder/ResponseOutput.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ public class ResponseOutput
/// </summary>
[JsonProperty("id")]
[JsonConverter(typeof(DefaultingIntegerConverter))]
public int Id { get; set; }
public long Id { get; set; }
}
}
2 changes: 1 addition & 1 deletion Source/Zencoder/Zencoder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ public void DeleteJob(int jobId, Action<DeleteJobResponse> callback)
/// </summary>
/// <param name="jobId">The ID of the job to get details for.</param>
/// <returns>The call response.</returns>
public JobDetailsResponse JobDetails(int jobId)
public JobDetailsResponse JobDetails(long jobId)
{
JobDetailsRequest request = new JobDetailsRequest(this)
{
Expand Down
7 changes: 5 additions & 2 deletions Source/Zencoder/Zencoder.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -10,13 +10,14 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Zencoder</RootNamespace>
<AssemblyName>Zencoder</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -27,6 +28,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Zencoder.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -36,6 +38,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Zencoder.xml</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=3.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down