aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs19
-rw-r--r--MediaBrowser.Model/Entities/BaseItem.cs2
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj10
3 files changed, 2 insertions, 29 deletions
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
deleted file mode 100644
index 2511377c1..000000000
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using MediaBrowser.Logging;
-
-namespace MediaBrowser.Model.Configuration
-{
- /// <summary>
- /// Serves as a common base class for the Server and UI application Configurations
- /// </summary>
- public class BaseApplicationConfiguration
- {
- public LogSeverity LogSeverity { get; set; }
- public int HttpServerPortNumber { get; set; }
-
- public BaseApplicationConfiguration()
- {
- LogSeverity = LogSeverity.Info;
- HttpServerPortNumber = 8096;
- }
- }
-}
diff --git a/MediaBrowser.Model/Entities/BaseItem.cs b/MediaBrowser.Model/Entities/BaseItem.cs
index 8a1ded03b..6f346a1dd 100644
--- a/MediaBrowser.Model/Entities/BaseItem.cs
+++ b/MediaBrowser.Model/Entities/BaseItem.cs
@@ -51,7 +51,7 @@ namespace MediaBrowser.Model.Entities
public string DisplayMediaType { get; set; }
public float? UserRating { get; set; }
- public int? RunTimeInSeconds { get; set; }
+ public int? RunTimeInMilliseconds { get; set; }
public string AspectRatio { get; set; }
public int? ProductionYear { get; set; }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 0157fcbf8..9485692d4 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -10,7 +10,7 @@
<RootNamespace>MediaBrowser.Model</RootNamespace>
<AssemblyName>MediaBrowser.Model</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <TargetFrameworkProfile>Profile95</TargetFrameworkProfile>
+ <TargetFrameworkProfile>Profile4</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
@@ -32,14 +32,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <!-- A reference to the entire .NET Framework is automatically included -->
- <ProjectReference Include="..\MediaBrowser.Logging\MediaBrowser.Logging.csproj">
- <Project>{37032b77-fe2e-4ec5-b7e4-baf634443578}</Project>
- <Name>MediaBrowser.Logging</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Configuration\BaseApplicationConfiguration.cs" />
<Compile Include="Configuration\UserConfiguration.cs" />
<Compile Include="Entities\ApiBaseItem.cs" />
<Compile Include="Entities\Audio.cs" />