Moved some entities to the main project

MediaBrowser.Api/ApiService.cs

@@ -1,8 +1,9 @@
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.DTO;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.Movies;
-using MediaBrowser.Model.Entities.TV;
 using System;
 using System.Collections.Generic;
 using System.Linq;

MediaBrowser.Api/HttpHandlers/AudioHandler.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;

MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs

@@ -2,7 +2,7 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Controller.Entities;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

MediaBrowser.Api/HttpHandlers/FavoriteStatusHandler.cs

@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
 using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/GenreHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/GenresHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Linq;

MediaBrowser.Api/HttpHandlers/ImageHandler.cs

@@ -2,6 +2,7 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 using System;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/ItemHandler.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;
 using System.Net;
 using System.Threading.Tasks;

MediaBrowser.Api/HttpHandlers/ItemListHandler.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.Movies;
 using System.ComponentModel.Composition;
 using System.Linq;
 using System.Net;

MediaBrowser.Api/HttpHandlers/PersonHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Net;

MediaBrowser.Api/HttpHandlers/PlayedStatusHandler.cs

@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
 using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/StudioHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/StudiosHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Linq;

MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Authentication;
-using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;
 using System.Net;
 using System.Threading.Tasks;

MediaBrowser.Api/HttpHandlers/UserHandler.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;
 using System.Net;
 using System.Threading.Tasks;

MediaBrowser.Api/HttpHandlers/UserItemRatingHandler.cs

@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
 using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;

MediaBrowser.Api/HttpHandlers/VideoHandler.cs

@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Drawing;
 using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
 using MediaBrowser.Model.Entities;
 using System;

MediaBrowser.Api/HttpHandlers/YearHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Net;

MediaBrowser.Api/HttpHandlers/YearsHandler.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net.Handlers;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.DTO;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Linq;

MediaBrowser.Common/Kernel/BaseKernel.cs

@@ -9,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.ComponentModel.Composition.Hosting;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -85,22 +86,18 @@ namespace MediaBrowser.Common.Kernel
             await ReloadComposableParts().ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Gets or sets the path to the current log file
-        /// </summary>
-        public static string LogFilePath { get; set; }
-
         private void ReloadLogger()
         {
             DisposeLogger();
 
             DateTime now = DateTime.Now;
 
-            LogFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
+            string logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");
 
-            FileStream fs = new FileStream(LogFilePath, FileMode.Append, FileAccess.Write, FileShare.Read);
+            Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
+            Trace.AutoFlush = true;
 
-            Logger.LoggerInstance = new StreamLogger(fs);
+            Logger.LoggerInstance = new TraceLogger();
         }
 
         /// <summary>
@@ -264,6 +261,8 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         private void DisposeLogger()
         {
+            Trace.Listeners.Clear();
+
             if (Logger.LoggerInstance != null)
             {
                 Logger.LoggerInstance.Dispose();

MediaBrowser.Common/Logging/ThreadedLogger.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading;
 
 namespace MediaBrowser.Common.Logging

MediaBrowser.Common/Logging/TraceLogger.cs

@@ -0,0 +1,12 @@
+using System.Diagnostics;
+
+namespace MediaBrowser.Common.Logging
+{
+    public class TraceLogger : BaseLogger
+    {
+        protected override void LogEntry(LogRow row)
+        {
+            Trace.WriteLine(row.ToString());
+        }
+    }
+}

MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -84,6 +84,7 @@
     <Compile Include="Kernel\BaseApplicationPaths.cs" />
     <Compile Include="Drawing\DrawingUtils.cs" />
     <Compile Include="Logging\ThreadedLogger.cs" />
+    <Compile Include="Logging\TraceLogger.cs" />
     <Compile Include="Net\Handlers\StaticFileHandler.cs" />
     <Compile Include="Net\MimeTypes.cs" />
     <Compile Include="Properties\Resources.Designer.cs">

MediaBrowser.Controller/Entities/Audio.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public class Audio : BaseItem
     {

MediaBrowser.Controller/Entities/BaseEntity.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
     /// Provides a base entity for all of our types

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -1,8 +1,9 @@
-using System;
+using MediaBrowser.Model.Entities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public abstract class BaseItem : BaseEntity, IHasProviderIds
     {

MediaBrowser.Controller/Entities/Folder.cs

@@ -1,8 +1,9 @@
-using System;
+using MediaBrowser.Model.Entities;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public class Folder : BaseItem
     {

MediaBrowser.Controller/Entities/Genre.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public class Genre : BaseEntity
     {

MediaBrowser.Controller/Entities/Movies/BoxSet.cs

@@ -0,0 +1,7 @@
+
+namespace MediaBrowser.Controller.Entities.Movies
+{
+    public class BoxSet : Folder
+    {
+    }
+}

MediaBrowser.Controller/Entities/Movies/Movie.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MediaBrowser.Model.Entities.Movies
+namespace MediaBrowser.Controller.Entities.Movies
 {
     public class Movie : Video
     {

MediaBrowser.Controller/Entities/Person.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     /// <summary>
     /// This is the full Person object that can be retrieved with all of it's data.

MediaBrowser.Controller/Entities/Studio.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public class Studio : BaseEntity
     {

MediaBrowser.Controller/Entities/TV/Episode.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.Entities.TV
+namespace MediaBrowser.Controller.Entities.TV
 {
     public class Episode : Video
     {

MediaBrowser.Controller/Entities/TV/Season.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Model.Entities.TV
+namespace MediaBrowser.Controller.Entities.TV
 {
     public class Season : Folder
     {

MediaBrowser.Controller/Entities/TV/Series.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Model.Entities.TV
+namespace MediaBrowser.Controller.Entities.TV
 {
     public class Series : Folder
     {

MediaBrowser.Controller/Entities/User.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public class User : BaseEntity
     {

MediaBrowser.Controller/Entities/Video.cs

@@ -0,0 +1,20 @@
+using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Entities
+{
+    public class Video : BaseItem
+    {
+        public VideoType VideoType { get; set; }
+
+        public List<SubtitleStream> Subtitles { get; set; }
+        public List<AudioStream> AudioStreams { get; set; }
+
+        public int Height { get; set; }
+        public int Width { get; set; }
+        public string ScanType { get; set; }
+        public float FrameRate { get; set; }
+        public int BitRate { get; set; }
+        public string Codec { get; set; }
+    }
+}

MediaBrowser.Controller/Entities/Year.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Model.Entities
+namespace MediaBrowser.Controller.Entities
 {
     public class Year : BaseEntity
     {

MediaBrowser.Controller/FFMpeg/FFProbe.cs

@@ -1,10 +1,10 @@
-using System;
+using MediaBrowser.Common.Logging;
+using MediaBrowser.Common.Serialization;
+using MediaBrowser.Controller.Entities;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Logging;
-using MediaBrowser.Common.Serialization;
-using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.FFMpeg
 {

MediaBrowser.Controller/IO/DirectoryWatchers.cs

@@ -1,10 +1,10 @@
-using System;
+using MediaBrowser.Controller.Entities;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.IO
 {

MediaBrowser.Controller/Kernel.cs

@@ -1,5 +1,7 @@
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Logging;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
@@ -7,8 +9,6 @@ using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Weather;
 using MediaBrowser.Model.Authentication;
 using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.TV;
 using MediaBrowser.Model.Progress;
 using System;
 using System.Collections.Generic;

MediaBrowser.Controller/Library/ItemController.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.IO;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

MediaBrowser.Controller/Library/ItemResolveEventArgs.cs

@@ -1,7 +1,7 @@
-using System;
-using System.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.Entities;
+using System;
+using System.IO;
 
 namespace MediaBrowser.Controller.Library
 {

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -50,6 +50,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -57,6 +58,22 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Entities\Audio.cs" />
+    <Compile Include="Entities\BaseEntity.cs" />
+    <Compile Include="Entities\BaseItem.cs" />
+    <Compile Include="Entities\Folder.cs" />
+    <Compile Include="Entities\Genre.cs" />
+    <Compile Include="Entities\Movies\BoxSet.cs" />
+    <Compile Include="Entities\Movies\Movie.cs" />
+    <Compile Include="Entities\Person.cs" />
+    <Compile Include="Entities\Studio.cs" />
+    <Compile Include="Entities\TV\Episode.cs" />
+    <Compile Include="Entities\TV\Season.cs" />
+    <Compile Include="Entities\TV\Series.cs" />
+    <Compile Include="Entities\User.cs" />
+    <Compile Include="Entities\UserItemData.cs" />
+    <Compile Include="Entities\Video.cs" />
+    <Compile Include="Entities\Year.cs" />
     <Compile Include="Providers\Movies\MovieProviderFromXml.cs" />
     <Compile Include="Providers\Movies\MovieSpecialFeaturesProvider.cs" />
     <Compile Include="Providers\TV\EpisodeImageFromMediaLocationProvider.cs" />

MediaBrowser.Controller/Providers/AudioInfoProvider.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.FFMpeg;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.FFMpeg;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

MediaBrowser.Controller/Providers/BaseItemXmlParser.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Xml;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Xml;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;

MediaBrowser.Controller/Providers/BaseMetadataProvider.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Providers

MediaBrowser.Controller/Providers/FolderProviderFromXml.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;

MediaBrowser.Controller/Providers/LocalTrailerProvider.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;

MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs

@@ -1,7 +1,6 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Xml;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.Movies;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.Movies;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;

MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;

MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities.TV;
 using System.IO;
 using System.Xml;
 

MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading.Tasks;

MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Model.Entities;
 using System;
 using System.Xml;
 

MediaBrowser.Controller/Providers/VideoInfoProvider.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.FFMpeg;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.FFMpeg;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;

MediaBrowser.Controller/Resolvers/AudioResolver.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 

MediaBrowser.Controller/Resolvers/BaseItemResolver.cs

@@ -1,8 +1,8 @@
-using System;
-using System.IO;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
+using System;
+using System.IO;
 
 namespace MediaBrowser.Controller.Resolvers
 {

MediaBrowser.Controller/Resolvers/FolderResolver.cs

@@ -1,6 +1,6 @@
-using System.ComponentModel.Composition;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
+using System.ComponentModel.Composition;
 
 namespace MediaBrowser.Controller.Resolvers
 {

MediaBrowser.Controller/Resolvers/Movies/BoxSetResolver.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities.Movies;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Library;
 using System;
 using System.ComponentModel.Composition;
 using System.IO;

MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs

@@ -1,7 +1,8 @@
-using MediaBrowser.Controller.IO;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.Movies;
 using System.ComponentModel.Composition;
 
 namespace MediaBrowser.Controller.Resolvers.Movies

MediaBrowser.Controller/Resolvers/TV/EpisodeResolver.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 
 namespace MediaBrowser.Controller.Resolvers.TV

MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs

@@ -1,5 +1,5 @@
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities.TV;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using System.ComponentModel.Composition;
 using System.IO;
 

MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Entities.TV;
 using System;
 using System.ComponentModel.Composition;
 using System.IO;

MediaBrowser.Controller/Resolvers/VideoResolver.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Entities;
 using System.ComponentModel.Composition;
 using System.IO;

MediaBrowser.Model/Entities/ItemSpecialCounts.cs

@@ -20,4 +20,47 @@ namespace MediaBrowser.Model.Entities
         [ProtoMember(4)]
         public decimal PlayedPercentage { get; set; }
     }
+
+    [ProtoContract]
+    public class AudioStream
+    {
+        [ProtoMember(1)]
+        public string Codec { get; set; }
+
+        [ProtoMember(2)]
+        public string Language { get; set; }
+
+        [ProtoMember(3)]
+        public int BitRate { get; set; }
+
+        [ProtoMember(4)]
+        public int Channels { get; set; }
+
+        [ProtoMember(5)]
+        public int SampleRate { get; set; }
+
+        [ProtoMember(6)]
+        public bool IsDefault { get; set; }
+    }
+
+    [ProtoContract]
+    public class SubtitleStream
+    {
+        [ProtoMember(1)]
+        public string Language { get; set; }
+
+        [ProtoMember(2)]
+        public bool IsDefault { get; set; }
+
+        [ProtoMember(3)]
+        public bool IsForced { get; set; }
+    }
+
+    public enum VideoType
+    {
+        VideoFile,
+        Iso,
+        DVD,
+        BluRay
+    }
 }

MediaBrowser.Model/Entities/Movies/BoxSet.cs

@@ -1,7 +0,0 @@
-
-namespace MediaBrowser.Model.Entities.Movies
-{
-    public class BoxSet : Folder
-    {
-    }
-}

MediaBrowser.Model/Entities/Video.cs

@@ -1,63 +0,0 @@
-using System.Collections.Generic;
-using ProtoBuf;
-
-namespace MediaBrowser.Model.Entities
-{
-    public class Video : BaseItem
-    {
-        public VideoType VideoType { get; set; }
-
-        public List<SubtitleStream> Subtitles { get; set; }
-        public List<AudioStream> AudioStreams { get; set; }
-
-        public int Height { get; set; }
-        public int Width { get; set; }
-        public string ScanType { get; set; }
-        public float FrameRate { get; set; }
-        public int BitRate { get; set; }
-        public string Codec { get; set; }
-    }
-
-    [ProtoContract]
-    public class AudioStream
-    {
-        [ProtoMember(1)]
-        public string Codec { get; set; }
-
-        [ProtoMember(2)]
-        public string Language { get; set; }
-
-        [ProtoMember(3)]
-        public int BitRate { get; set; }
-
-        [ProtoMember(4)]
-        public int Channels { get; set; }
-
-        [ProtoMember(5)]
-        public int SampleRate { get; set; }
-
-        [ProtoMember(6)]
-        public bool IsDefault { get; set; }
-    }
-
-    [ProtoContract]
-    public class SubtitleStream
-    {
-        [ProtoMember(1)]
-        public string Language { get; set; }
-
-        [ProtoMember(2)]
-        public bool IsDefault { get; set; }
-
-        [ProtoMember(3)]
-        public bool IsForced { get; set; }
-    }
-
-    public enum VideoType
-    {
-        VideoFile,
-        Iso,
-        DVD,
-        BluRay
-    }
-}

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -44,31 +44,15 @@
     <Compile Include="DTO\DTOUser.cs" />
     <Compile Include="DTO\VideoInfo.cs" />
     <Compile Include="DTO\VideoOutputFormats.cs" />
-    <Compile Include="Entities\Audio.cs" />
-    <Compile Include="Entities\BaseEntity.cs" />
-    <Compile Include="Entities\BaseItem.cs" />
     <Compile Include="DTO\IBNItem.cs" />
-    <Compile Include="Entities\Folder.cs" />
-    <Compile Include="Entities\Genre.cs" />
     <Compile Include="Entities\ImageType.cs" />
     <Compile Include="Entities\IHasProviderIds.cs" />
     <Compile Include="Entities\ItemSpecialCounts.cs" />
     <Compile Include="Entities\MetadataProviders.cs" />
-    <Compile Include="Entities\Movies\BoxSet.cs" />
-    <Compile Include="Entities\Movies\Movie.cs" />
-    <Compile Include="Entities\Person.cs" />
-    <Compile Include="Entities\Studio.cs" />
-    <Compile Include="Entities\TV\Episode.cs" />
-    <Compile Include="Entities\TV\Season.cs" />
-    <Compile Include="Entities\TV\Series.cs" />
-    <Compile Include="Entities\Video.cs" />
-    <Compile Include="Entities\Year.cs" />
     <Compile Include="Plugins\BasePluginConfiguration.cs" />
     <Compile Include="DTO\PluginInfo.cs" />
     <Compile Include="Progress\TaskProgress.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Entities\User.cs" />
-    <Compile Include="Entities\UserItemData.cs" />
     <Compile Include="Weather\WeatherForecast.cs" />
     <Compile Include="Weather\WeatherInfo.cs" />
     <Compile Include="Weather\WeatherStatus.cs" />