diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-23 21:44:05 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-09-23 21:44:05 -0400 |
| commit | 995353e21671b08838064f77c4bae5382d0bbf83 (patch) | |
| tree | 8dcdaca47a2102509ac9ad0d83dbc37ebbe7d264 /MediaBrowser.Dlna/ContentDirectory | |
| parent | dbb8ec192f90ce0a61b5c7d64ecd73bb8dcb4101 (diff) | |
add dish hopper profile
Diffstat (limited to 'MediaBrowser.Dlna/ContentDirectory')
| -rw-r--r-- | MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs b/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs index dce93ae4e9..87f705e16a 100644 --- a/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs +++ b/MediaBrowser.Dlna/ContentDirectory/ContentDirectory.cs @@ -4,6 +4,7 @@ using MediaBrowser.Controller.Dlna; using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Localization; using MediaBrowser.Dlna.Service; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Logging; @@ -21,6 +22,7 @@ namespace MediaBrowser.Dlna.ContentDirectory private readonly IDlnaManager _dlna; private readonly IServerConfigurationManager _config; private readonly IUserManager _userManager; + private readonly ILocalizationManager _localization; public ContentDirectory(IDlnaManager dlna, IUserDataManager userDataManager, @@ -29,7 +31,7 @@ namespace MediaBrowser.Dlna.ContentDirectory IServerConfigurationManager config, IUserManager userManager, ILogger logger, - IHttpClient httpClient) + IHttpClient httpClient, ILocalizationManager localization) : base(logger, httpClient) { _dlna = dlna; @@ -38,6 +40,7 @@ namespace MediaBrowser.Dlna.ContentDirectory _libraryManager = libraryManager; _config = config; _userManager = userManager; + _localization = localization; } private int SystemUpdateId @@ -73,7 +76,8 @@ namespace MediaBrowser.Dlna.ContentDirectory _userDataManager, user, SystemUpdateId, - _config) + _config, + _localization) .ProcessControlRequest(request); } diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs index 330ddba69f..59b907f7d5 100644 --- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs +++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs @@ -3,6 +3,7 @@ using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Localization; using MediaBrowser.Dlna.Didl; using MediaBrowser.Dlna.Server; using MediaBrowser.Dlna.Service; @@ -38,7 +39,7 @@ namespace MediaBrowser.Dlna.ContentDirectory private readonly DeviceProfile _profile; - public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config) + public ControlHandler(ILogger logger, ILibraryManager libraryManager, DeviceProfile profile, string serverAddress, IImageProcessor imageProcessor, IUserDataManager userDataManager, User user, int systemUpdateId, IServerConfigurationManager config, ILocalizationManager localization) : base(config, logger) { _libraryManager = libraryManager; @@ -47,7 +48,7 @@ namespace MediaBrowser.Dlna.ContentDirectory _systemUpdateId = systemUpdateId; _profile = profile; - _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, userDataManager); + _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, userDataManager, localization); } protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, Headers methodParams) @@ -182,7 +183,7 @@ namespace MediaBrowser.Dlna.ContentDirectory if (folder == null) { - result.DocumentElement.AppendChild(_didlBuilder.GetItemElement(result, item, deviceId, filter)); + result.DocumentElement.AppendChild(_didlBuilder.GetItemElement(result, item, null, deviceId, filter)); } else { @@ -214,7 +215,7 @@ namespace MediaBrowser.Dlna.ContentDirectory } else { - result.DocumentElement.AppendChild(_didlBuilder.GetItemElement(result, i, deviceId, filter)); + result.DocumentElement.AppendChild(_didlBuilder.GetItemElement(result, i, folder, deviceId, filter)); } } } @@ -288,7 +289,7 @@ namespace MediaBrowser.Dlna.ContentDirectory } else { - result.DocumentElement.AppendChild(_didlBuilder.GetItemElement(result, i, deviceId, filter)); + result.DocumentElement.AppendChild(_didlBuilder.GetItemElement(result, i, folder, deviceId, filter)); } } |
