From d4c75e39748679e7c039cb1eae4ad7232e2fe2b6 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Mon, 30 Jul 2012 23:38:00 -0400 Subject: Fixed some project fragmentation that came from efforts to go portable --- MediaBrowser.Controller/Configuration/ServerConfiguration.cs | 1 + MediaBrowser.Controller/UserController.cs | 2 +- MediaBrowser.Controller/Xml/BaseItemXmlParser.cs | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Configuration/ServerConfiguration.cs b/MediaBrowser.Controller/Configuration/ServerConfiguration.cs index e6f794595..56f3a854f 100644 --- a/MediaBrowser.Controller/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Controller/Configuration/ServerConfiguration.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using MediaBrowser.Common.Configuration; using MediaBrowser.Model.Configuration; namespace MediaBrowser.Controller.Configuration diff --git a/MediaBrowser.Controller/UserController.cs b/MediaBrowser.Controller/UserController.cs index 7fac4392e..c53397a31 100644 --- a/MediaBrowser.Controller/UserController.cs +++ b/MediaBrowser.Controller/UserController.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.IO; -using MediaBrowser.Common.Json; using MediaBrowser.Model.Users; +using MediaBrowser.Common.Json; namespace MediaBrowser.Controller { diff --git a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs index ed8afd5a7..d3a7c3bd7 100644 --- a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs @@ -384,14 +384,14 @@ namespace MediaBrowser.Controller.Xml break; case "Duration": - item.RunTimeInSeconds = reader.ReadIntSafe() * 60; + item.RunTimeInMilliseconds = reader.ReadIntSafe() * 60000; break; case "DurationSeconds": int seconds = reader.ReadIntSafe(); if (seconds > 0) { - item.RunTimeInSeconds = seconds; + item.RunTimeInMilliseconds = seconds * 1000; } break; -- cgit v1.2.3