diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-02 09:45:02 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-02 09:45:02 -0400 |
| commit | e52833059bc819cbdb41ba204b82aee1760ddb3a (patch) | |
| tree | e55fd39ffcbc2d268639610cf78b987b21973884 /MediaBrowser.Controller | |
| parent | 7ad612bb4b181a7426c1ba2d15692c1f230d236c (diff) | |
Moved server configuration to the model so that the UI can read it
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Configuration/ServerConfiguration.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Kernel.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/ServerApplicationPaths.cs (renamed from MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs) | 4 |
4 files changed, 4 insertions, 15 deletions
diff --git a/MediaBrowser.Controller/Configuration/ServerConfiguration.cs b/MediaBrowser.Controller/Configuration/ServerConfiguration.cs deleted file mode 100644 index 368c8ef37..000000000 --- a/MediaBrowser.Controller/Configuration/ServerConfiguration.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MediaBrowser.Common.Configuration;
-
-namespace MediaBrowser.Controller.Configuration
-{
- public class ServerConfiguration : BaseApplicationConfiguration
- {
- public bool EnableInternetProviders { get; set; }
- public string WeatherZipCode { get; set; }
- }
-}
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 1a161ccc9..32f4a5828 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -9,12 +9,12 @@ using System.Text; using System.Threading.Tasks;
using MediaBrowser.Common.Kernel;
using MediaBrowser.Common.Logging;
-using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Controller.Weather;
+using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Progress;
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index f72202fea..1547deea2 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -58,8 +58,7 @@ <Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Configuration\ServerApplicationPaths.cs" />
- <Compile Include="Configuration\ServerConfiguration.cs" />
+ <Compile Include="ServerApplicationPaths.cs" />
<Compile Include="Library\ItemResolveEventArgs.cs" />
<Compile Include="FFMpeg\FFProbe.cs" />
<Compile Include="FFMpeg\FFProbeResult.cs" />
diff --git a/MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs b/MediaBrowser.Controller/ServerApplicationPaths.cs index 92283ab25..0f4932fd0 100644 --- a/MediaBrowser.Controller/Configuration/ServerApplicationPaths.cs +++ b/MediaBrowser.Controller/ServerApplicationPaths.cs @@ -1,7 +1,7 @@ using System.IO;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Kernel;
-namespace MediaBrowser.Controller.Configuration
+namespace MediaBrowser.Controller
{
/// <summary>
/// Extends BaseApplicationPaths to add paths that are only applicable on the server
|