fix up some merge errors

MediaBrowser.Common/MediaBrowser.Common.csproj.orig

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9142EEFA-7570-41E1-BFCC-468BB571AF2F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MediaBrowser.Common</RootNamespace>
-    <AssemblyName>MediaBrowser.Common</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="ServiceStack.Text, Version=3.9.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ServiceStack.Text.3.9.3\lib\net35\ServiceStack.Text.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Reactive, Version=1.0.10621.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Rx-Main.1.0.11226\lib\Net4\System.Reactive.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Configuration\ApplicationPaths.cs" />
-    <Compile Include="Configuration\BaseApplicationConfiguration.cs" />
-    <Compile Include="Events\GenericItemEventArgs.cs" />
-    <Compile Include="Serialization\JsonSerializer.cs" />
-    <Compile Include="Kernel\BaseKernel.cs" />
-    <Compile Include="Kernel\KernelContext.cs" />
-    <Compile Include="Logging\BaseLogger.cs" />
-    <Compile Include="Logging\Logger.cs" />
-    <Compile Include="Logging\LogRow.cs" />
-    <Compile Include="Logging\LogSeverity.cs" />
-    <Compile Include="Logging\StreamLogger.cs" />
-    <Compile Include="Net\CollectionExtensions.cs" />
-    <Compile Include="Net\Handlers\BaseEmbeddedResourceHandler.cs" />
-    <Compile Include="Net\Handlers\BaseHandler.cs" />
-    <Compile Include="Net\Handlers\BaseJsonHandler.cs" />
-    <Compile Include="Net\HttpServer.cs" />
-    <Compile Include="Net\Request.cs" />
-    <Compile Include="Net\RequestContext.cs" />
-    <Compile Include="Net\StreamExtensions.cs" />
-    <Compile Include="Plugins\BasePlugin.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\Splash.xaml.cs">
-      <DependentUpon>Splash.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UI\SingleInstance.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
-      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
-      <Name>MediaBrowser.Model</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="UI\Splash.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

MediaBrowser.Controller/IO/DirectoryWatchers.cs

@@ -41,6 +41,7 @@ namespace MediaBrowser.Controller.IO
             {
                 Logger.LogInfo("Watching directory " + path + " for changes.");
 
+                var watcher = new FileSystemWatcher(path, "*") { }; 
                 watcher.IncludeSubdirectories = true;
 
                 watcher.Changed += watcher_Changed;

MediaBrowser.Controller/Kernel.cs

@@ -124,6 +124,7 @@ namespace MediaBrowser.Controller
 
             progress.Report(new TaskProgress { Description = "Loading Media Library" });
             await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false);
+
         }
 
         /// <summary>
@@ -137,8 +138,6 @@ namespace MediaBrowser.Controller
 
             DisposeWeatherClient();
 
-            ItemController.PreBeginResolvePath -= ItemController_PreBeginResolvePath;
-            ItemController.BeginResolvePath -= ItemController_BeginResolvePath;
         }
 
         protected override void OnComposablePartsLoaded()
@@ -188,6 +187,7 @@ namespace MediaBrowser.Controller
             DirectoryWatchers.Stop();
 
             RootFolder = await ItemController.GetItem(MediaRootFolderPath, allowInternetProviders: allowInternetProviders).ConfigureAwait(false) as Folder;
+            RootFolder.ChildrenChanged += RootFolder_ChildrenChanged;
 
             DirectoryWatchers.Start();
         }

MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs

@@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies
                 return new Movie()
                 {
                     Path = args.Path,
-                    VideoType = VideoType.DVD
+                    VideoType = VideoType.Dvd
                 };
             }
             else if (args.IsBDFolder)
@@ -83,6 +83,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies
             // Loop through each child file/folder and see if we find a video
             foreach (var child in args.FileSystemChildren)
             {
+                var childArgs = new ItemResolveEventArgs
                 {
                     FileInfo = child,
                     FileSystemChildren = new WIN32_FIND_DATA[] { },