Bump version to 10.2.2

Add Debian armhf (Rasberry Pi) build plus crossbuild

.copr/Makefile

@@ -0,0 +1,8 @@
+srpm:
+	dnf -y install git
+	git submodule update --init --recursive
+	cd deployment/fedora-package-x64;                    \
+	./create_tarball.sh;                                 \
+	rpmbuild -bs pkg-src/jellyfin.spec                   \
+	         --define "_sourcedir $$PWD/pkg-src/"        \
+		 --define "_srcrpmdir $(outdir)"

.dockerignore

@@ -1,5 +1,10 @@
 .git
 .dockerignore
 Dockerfile
+Dockerfile.arm
+Dockerfile.arm64
 CONTRIBUTORS.md
 README.md
+deployment/*/dist
+deployment/*/pkg-dist
+deployment/collect-dist/

.drone.yml

@@ -9,4 +9,4 @@ steps:
 - name: build
   image: microsoft/dotnet:2-sdk
   commands:
-    - dotnet publish --configuration release --output /release
+    - dotnet publish --configuration release --output /release Jellyfin.Server

.editorconfig

@@ -1,13 +1,13 @@
 # With more recent updates Visual Studio 2017 supports EditorConfig files out of the box
 # Visual Studio Code needs an extension: https://github.com/editorconfig/editorconfig-vscode
 # For emacs, vim, np++ and other editors, see here: https://github.com/editorconfig
-############################### 
+###############################
-# Core EditorConfig Options   # 
+# Core EditorConfig Options   #
-############################### 
+###############################
-# All files 
-[*] 
-indent_style = space 
 root = true
+# All files
+[*]
+indent_style = space
 indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
@@ -15,119 +15,117 @@ insert_final_newline = true
 end_of_line = lf
 max_line_length = null
 
-# Code files 
+# XML indentation
-[*.{cs,csx,vb,vbx}] 
+[*.{csproj,xml}]
-indent_size = 4 
+indent_size = 2
-insert_final_newline = true 
+###############################
-charset = utf-8
+# .NET Coding Conventions     #
-############################### 
+###############################
-# .NET Coding Conventions     # 
+[*.{cs,vb}]
-############################### 
+# Organize usings
-[*.{cs,vb}] 
+dotnet_sort_system_directives_first = true
-# Organize usings 
+# this. preferences
-dotnet_sort_system_directives_first = true 
+dotnet_style_qualification_for_field = false:silent
-# this. preferences 
+dotnet_style_qualification_for_property = false:silent
-dotnet_style_qualification_for_field = false:silent 
+dotnet_style_qualification_for_method = false:silent
-dotnet_style_qualification_for_property = false:silent 
+dotnet_style_qualification_for_event = false:silent
-dotnet_style_qualification_for_method = false:silent 
+# Language keywords vs BCL types preferences
-dotnet_style_qualification_for_event = false:silent 
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-# Language keywords vs BCL types preferences 
+dotnet_style_predefined_type_for_member_access = true:silent
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent 
+# Parentheses preferences
-dotnet_style_predefined_type_for_member_access = true:silent 
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-# Parentheses preferences 
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent 
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent 
+# Modifier preferences
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent 
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
-# Modifier preferences 
+dotnet_style_readonly_field = true:suggestion
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent 
+# Expression-level preferences
-dotnet_style_readonly_field = true:suggestion 
+dotnet_style_object_initializer = true:suggestion
-# Expression-level preferences 
+dotnet_style_collection_initializer = true:suggestion
-dotnet_style_object_initializer = true:suggestion 
+dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_collection_initializer = true:suggestion 
+dotnet_style_null_propagation = true:suggestion
-dotnet_style_explicit_tuple_names = true:suggestion 
+dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_null_propagation = true:suggestion 
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
-dotnet_style_coalesce_expression = true:suggestion 
+dotnet_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent 
+dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_prefer_inferred_tuple_names = true:suggestion 
+dotnet_style_prefer_auto_properties = true:silent
-dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion 
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_auto_properties = true:silent 
+dotnet_style_prefer_conditional_expression_over_return = true:silent
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent 
+###############################
-dotnet_style_prefer_conditional_expression_over_return = true:silent 
+# Naming Conventions          #
-############################### 
+###############################
-# Naming Conventions          # 
+# Style Definitions
-############################### 
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
-# Style Definitions 
+# Use PascalCase for constant fields
-dotnet_naming_style.pascal_case_style.capitalization             = pascal_case 
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
-# Use PascalCase for constant fields   
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion 
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
-dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields 
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style 
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
-dotnet_naming_symbols.constant_fields.applicable_kinds            = field 
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
-dotnet_naming_symbols.constant_fields.applicable_accessibilities  = * 
+###############################
-dotnet_naming_symbols.constant_fields.required_modifiers          = const 
+# C# Coding Conventions       #
-############################### 
+###############################
-# C# Coding Conventions       # 
+[*.cs]
-############################### 
+# var preferences
-[*.cs] 
+csharp_style_var_for_built_in_types = true:silent
-# var preferences 
+csharp_style_var_when_type_is_apparent = true:silent
-csharp_style_var_for_built_in_types = true:silent 
+csharp_style_var_elsewhere = true:silent
-csharp_style_var_when_type_is_apparent = true:silent 
+# Expression-bodied members
-csharp_style_var_elsewhere = true:silent 
+csharp_style_expression_bodied_methods = false:silent
-# Expression-bodied members 
+csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_methods = false:silent 
+csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_constructors = false:silent 
+csharp_style_expression_bodied_properties = true:silent
-csharp_style_expression_bodied_operators = false:silent 
+csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_properties = true:silent 
+csharp_style_expression_bodied_accessors = true:silent
-csharp_style_expression_bodied_indexers = true:silent 
+# Pattern matching preferences
-csharp_style_expression_bodied_accessors = true:silent 
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-# Pattern matching preferences 
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion 
+# Null-checking preferences
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion 
+csharp_style_throw_expression = true:suggestion
-# Null-checking preferences 
+csharp_style_conditional_delegate_call = true:suggestion
-csharp_style_throw_expression = true:suggestion 
+# Modifier preferences
-csharp_style_conditional_delegate_call = true:suggestion 
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
-# Modifier preferences 
+# Expression-level preferences
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion 
+csharp_prefer_braces = true:silent
-# Expression-level preferences 
+csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_prefer_braces = true:silent 
+csharp_prefer_simple_default_expression = true:suggestion
-csharp_style_deconstructed_variable_declaration = true:suggestion 
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
-csharp_prefer_simple_default_expression = true:suggestion 
+csharp_style_inlined_variable_declaration = true:suggestion
-csharp_style_pattern_local_over_anonymous_function = true:suggestion 
+###############################
-csharp_style_inlined_variable_declaration = true:suggestion 
+# C# Formatting Rules         #
-############################### 
+###############################
-# C# Formatting Rules         # 
+# New line preferences
-############################### 
+csharp_new_line_before_open_brace = all
-# New line preferences 
+csharp_new_line_before_else = true
-csharp_new_line_before_open_brace = all 
+csharp_new_line_before_catch = true
-csharp_new_line_before_else = true 
+csharp_new_line_before_finally = true
-csharp_new_line_before_catch = true 
+csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_finally = true 
+csharp_new_line_before_members_in_anonymous_types = true
-csharp_new_line_before_members_in_object_initializers = true 
+csharp_new_line_between_query_expression_clauses = true
-csharp_new_line_before_members_in_anonymous_types = true 
+# Indentation preferences
-csharp_new_line_between_query_expression_clauses = true 
+csharp_indent_case_contents = true
-# Indentation preferences 
+csharp_indent_switch_labels = true
-csharp_indent_case_contents = true 
+csharp_indent_labels = flush_left
-csharp_indent_switch_labels = true 
+# Space preferences
-csharp_indent_labels = flush_left 
+csharp_space_after_cast = false
-# Space preferences 
+csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_cast = false 
+csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_after_keywords_in_control_flow_statements = true 
+csharp_space_between_method_declaration_parameter_list_parentheses = false
-csharp_space_between_method_call_parameter_list_parentheses = false 
+csharp_space_between_parentheses = false
-csharp_space_between_method_declaration_parameter_list_parentheses = false 
+csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_between_parentheses = false 
+csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_before_colon_in_inheritance_clause = true 
+csharp_space_around_binary_operators = before_and_after
-csharp_space_after_colon_in_inheritance_clause = true 
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_around_binary_operators = before_and_after 
+csharp_space_between_method_call_name_and_opening_parenthesis = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false 
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false 
+# Wrapping preferences
-csharp_space_between_method_call_empty_parameter_list_parentheses = false 
+csharp_preserve_single_line_statements = true
-# Wrapping preferences 
+csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = true 
+###############################
-csharp_preserve_single_line_blocks = true 
+# VB Coding Conventions       #
-############################### 
+###############################
-# VB Coding Conventions       # 
+[*.vb]
-############################### 
+# Modifier preferences
-[*.vb] 
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
-# Modifier preferences 
-visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,23 +8,23 @@ assignees: ''
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 **To Reproduce**
-Steps to reproduce the behavior:
+<!-- Steps to reproduce the behavior: -->
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
-A clear and concise description of what you expected to happen.
+<!-- A clear and concise description of what you expected to happen. -->
 
 **Logs**
-Please paste any log errors.
+<!-- Please paste any log errors. -->
 
 **Screenshots**
-If applicable, add screenshots to help explain your problem.
+<!-- If applicable, add screenshots to help explain your problem. -->
 
 **System (please complete the following information):**
  - OS: [e.g. Docker, Debian, Windows]
@@ -32,4 +32,4 @@ If applicable, add screenshots to help explain your problem.
  - Jellyfin Version: [e.g. 10.0.1]
 
 **Additional context**
-Add any other context about the problem here.
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/enhancement-request.md

@@ -8,13 +8,13 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
 **Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what you want to happen. -->
 
 **Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Describe the feature you'd like**
-A clear and concise description of what you want to happen.
+<!-- A clear and concise description of what you want to happen. -->
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->

.github/pull_request_template.md

@@ -1,9 +1,11 @@
+<!--
 Ensure your title is short, descriptive, and in the imperative mood (Fix X, Change Y, instead of Fixed X, Changed Y).
 For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our https://jellyfin.readthedocs.io/en/latest/developer-docs/contributing/ page.
+-->
 
 **Changes**
-Describe your changes here in 1-5 sentences.
+<!-- Describe your changes here in 1-5 sentences. -->
 
 **Issues**
-Tag any issues that this PR solves here.
+<!-- Tag any issues that this PR solves here.
-Fixes #
+ex. Fixes # -->

.gitignore

@@ -1,5 +1,3 @@
-!*
-
 .directory
 
 #################
@@ -49,6 +47,8 @@ ProgramData-UI*/
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+.vs/
+
 # User-specific files
 *.suo
 *.user
@@ -204,7 +204,6 @@ $RECYCLE.BIN/
 # Mac crap
 .DS_Store
 
-
 #############
 ## Python
 #############
@@ -234,24 +233,34 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
-MediaBrowser.WebDashboard/dashboard-ui/.idea/
-/.vs
 
 ##########
 # Rider
 ##########
 .idea/
 
+##########
+# Visual Studio Code
+##########
+.vscode/
+
 #########################
-# Debian build artifacts
+# Build artifacts
 #########################
 
-debian/.debhelper/
+# Artifacts for debian-x64
-debian/*.debhelper
+deployment/debian-package-x64/pkg-src/.debhelper/
-debian/debhelper-build-stamp
+deployment/debian-package-x64/pkg-src/*.debhelper
-debian/files
+deployment/debian-package-x64/pkg-src/debhelper-build-stamp
-debian/jellyfin.substvars
+deployment/debian-package-x64/pkg-src/files
-debian/jellyfin/
+deployment/debian-package-x64/pkg-src/jellyfin.substvars
-
+deployment/debian-package-x64/pkg-src/jellyfin/
 # Don't ignore the debian/bin folder
-!debian/bin/
+!deployment/debian-package-x64/pkg-src/bin/
+
+deployment/**/dist/
+deployment/**/pkg-dist/
+deployment/**/pkg-dist-tmp/
+deployment/collect-dist/
+
+jellyfin_version.ini

.gitmodules

@@ -1,3 +1,4 @@
-[submodule "ThirdParty/taglib-sharp"]
+[submodule "MediaBrowser.WebDashboard/jellyfin-web"]
-	path = ThirdParty/taglib-sharp
+	path = MediaBrowser.WebDashboard/jellyfin-web
-	url = https://github.com/mono/taglib-sharp.git
+	url = https://github.com/jellyfin/jellyfin-web.git
+	branch = .

BDInfo/BDInfo.csproj

@@ -1,4 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />

BDInfo/BDInfoSettings.cs

@@ -1,105 +1,33 @@
-
+
 namespace BDInfo
 {
     class BDInfoSettings
     {
-        public static bool GenerateStreamDiagnostics
+        public static bool GenerateStreamDiagnostics => true;
-        {
-            get
-            {
-                return true;
-            }
-        }
 
-        public static bool EnableSSIF
+        public static bool EnableSSIF => true;
-        {
-            get
-            {
-                return true;
-            }
-        }
 
-        public static bool AutosaveReport
+        public static bool AutosaveReport => false;
-        {
-            get
-            {
-                return false;
-            }
-        }
 
-        public static bool GenerateFrameDataFile
+        public static bool GenerateFrameDataFile => false;
-        {
-            get
-            {
-                return false;
-            }
-        }
 
-        public static bool FilterLoopingPlaylists
+        public static bool FilterLoopingPlaylists => true;
-        {
-            get
-            {
-                return true;
-            }
-        }
 
-        public static bool FilterShortPlaylists
+        public static bool FilterShortPlaylists => false;
-        {
-            get
-            {
-                return false;
-            }
-        }
 
-        public static int FilterShortPlaylistsValue
+        public static int FilterShortPlaylistsValue => 0;
-        {
-            get
-            {
-                return 0;
-            }
-        }
 
-        public static bool UseImagePrefix
+        public static bool UseImagePrefix => false;
-        {
-            get
-            {
-                return false;
-            }
-        }
 
-        public static string UseImagePrefixValue
+        public static string UseImagePrefixValue => null;
-        {
-            get
-            {
-                return null;
-            }
-        }
 
         /// <summary>
         /// Setting this to false throws an IComparer error on some discs.
         /// </summary>
-        public static bool KeepStreamOrder
+        public static bool KeepStreamOrder => true;
-        {
-            get
-            {
-                return true;
-            }
-        }
 
-        public static bool GenerateTextSummary
+        public static bool GenerateTextSummary => false;
-        {
-            get
-            {
-                return false;
-            }
-        }
 
-        public static string LastPath
+        public static string LastPath => string.Empty;
-        {
-            get
-            {
-                return string.Empty;
-            }
-        }
     }
 }

BDInfo/BDROM.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -22,7 +22,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Text;
 
 namespace BDInfo
 {
@@ -72,12 +71,11 @@ namespace BDInfo
 
         public event OnPlaylistFileScanError PlaylistFileScanError;
 
-        public BDROM(
+        public BDROM(string path, IFileSystem fileSystem)
-            string path, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
             }
 
             _fileSystem = fileSystem;
@@ -94,7 +92,7 @@ namespace BDInfo
             }
 
             DirectoryRoot =
-                _fileSystem.GetDirectoryInfo(_fileSystem.GetDirectoryName(DirectoryBDMV.FullName));
+                _fileSystem.GetDirectoryInfo(Path.GetDirectoryName(DirectoryBDMV.FullName));
             DirectoryBDJO =
                 GetDirectory("BDJO", DirectoryBDMV, 0);
             DirectoryCLIPINF =
@@ -152,7 +150,7 @@ namespace BDInfo
                 Is3D = true;
             }
 
-            if (_fileSystem.FileExists(Path.Combine(DirectoryRoot.FullName, "FilmIndex.xml")))
+            if (File.Exists(Path.Combine(DirectoryRoot.FullName, "FilmIndex.xml")))
             {
                 IsDBOX = true;
             }
@@ -164,17 +162,17 @@ namespace BDInfo
             if (DirectoryPLAYLIST != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectoryPLAYLIST.FullName, ".mpls").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     PlaylistFiles.Add(
-                        file.Name.ToUpper(), new TSPlaylistFile(this, file, _fileSystem, textEncoding));
+                        file.Name.ToUpper(), new TSPlaylistFile(this, file, _fileSystem));
                 }
             }
 
             if (DirectorySTREAM != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectorySTREAM.FullName, ".m2ts").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     StreamFiles.Add(
                         file.Name.ToUpper(), new TSStreamFile(file, _fileSystem));
@@ -184,17 +182,17 @@ namespace BDInfo
             if (DirectoryCLIPINF != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectoryCLIPINF.FullName, ".clpi").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     StreamClipFiles.Add(
-                        file.Name.ToUpper(), new TSStreamClipFile(file, _fileSystem, textEncoding));
+                        file.Name.ToUpper(), new TSStreamClipFile(file, _fileSystem));
                 }
             }
 
             if (DirectorySSIF != null)
             {
                 FileSystemMetadata[] files = GetFiles(DirectorySSIF.FullName, ".ssif").ToArray();
-                foreach (FileSystemMetadata file in files)
+                foreach (var file in files)
                 {
                     InterleavedFiles.Add(
                         file.Name.ToUpper(), new TSInterleavedFile(file));
@@ -214,8 +212,8 @@ namespace BDInfo
 
         public void Scan()
         {
-            List<TSStreamClipFile> errorStreamClipFiles = new List<TSStreamClipFile>();
+            var errorStreamClipFiles = new List<TSStreamClipFile>();
-            foreach (TSStreamClipFile streamClipFile in StreamClipFiles.Values)
+            foreach (var streamClipFile in StreamClipFiles.Values)
             {
                 try
                 {
@@ -235,11 +233,11 @@ namespace BDInfo
                             break;
                         }
                     }
-                    else throw ex;
+                    else throw;
                 }
             }
 
-            foreach (TSStreamFile streamFile in StreamFiles.Values)
+            foreach (var streamFile in StreamFiles.Values)
             {
                 string ssifName = Path.GetFileNameWithoutExtension(streamFile.Name) + ".SSIF";
                 if (InterleavedFiles.ContainsKey(ssifName))
@@ -252,8 +250,8 @@ namespace BDInfo
             StreamFiles.Values.CopyTo(streamFiles, 0);
             Array.Sort(streamFiles, CompareStreamFiles);
 
-            List<TSPlaylistFile> errorPlaylistFiles = new List<TSPlaylistFile>();
+            var errorPlaylistFiles = new List<TSPlaylistFile>();
-            foreach (TSPlaylistFile playlistFile in PlaylistFiles.Values)
+            foreach (var playlistFile in PlaylistFiles.Values)
             {
                 try
                 {
@@ -273,19 +271,19 @@ namespace BDInfo
                             break;
                         }
                     }
-                    else throw ex;
+                    else throw;
                 }
             }
 
-            List<TSStreamFile> errorStreamFiles = new List<TSStreamFile>();
+            var errorStreamFiles = new List<TSStreamFile>();
-            foreach (TSStreamFile streamFile in streamFiles)
+            foreach (var streamFile in streamFiles)
             {
                 try
                 {
-                    List<TSPlaylistFile> playlists = new List<TSPlaylistFile>();
+                    var playlists = new List<TSPlaylistFile>();
-                    foreach (TSPlaylistFile playlist in PlaylistFiles.Values)
+                    foreach (var playlist in PlaylistFiles.Values)
                     {
-                        foreach (TSStreamClip streamClip in playlist.StreamClips)
+                        foreach (var streamClip in playlist.StreamClips)
                         {
                             if (streamClip.Name == streamFile.Name)
                             {
@@ -310,16 +308,16 @@ namespace BDInfo
                             break;
                         }
                     }
-                    else throw ex;
+                    else throw;
                 }
             }
 
-            foreach (TSPlaylistFile playlistFile in PlaylistFiles.Values)
+            foreach (var playlistFile in PlaylistFiles.Values)
             {
                 playlistFile.Initialize();
                 if (!Is50Hz)
                 {
-                    foreach (TSVideoStream videoStream in playlistFile.VideoStreams)
+                    foreach (var videoStream in playlistFile.VideoStreams)
                     {
                         if (videoStream.FrameRate == TSFrameRate.FRAMERATE_25 ||
                             videoStream.FrameRate == TSFrameRate.FRAMERATE_50)
@@ -336,7 +334,7 @@ namespace BDInfo
         {
             if (string.IsNullOrEmpty(path))
             {
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
             }
 
             FileSystemMetadata dir = _fileSystem.GetDirectoryInfo(path);
@@ -347,7 +345,7 @@ namespace BDInfo
                 {
                     return dir;
                 }
-                var parentFolder = _fileSystem.GetDirectoryName(dir.FullName);
+                var parentFolder = Path.GetDirectoryName(dir.FullName);
                 if (string.IsNullOrEmpty(parentFolder))
                 {
                     dir = null;
@@ -369,7 +367,7 @@ namespace BDInfo
             if (dir != null)
             {
                 FileSystemMetadata[] children = _fileSystem.GetDirectories(dir.FullName).ToArray();
-                foreach (FileSystemMetadata child in children)
+                foreach (var child in children)
                 {
                     if (string.Equals(child.Name, name, StringComparison.OrdinalIgnoreCase))
                     {
@@ -378,7 +376,7 @@ namespace BDInfo
                 }
                 if (searchDepth > 0)
                 {
-                    foreach (FileSystemMetadata child in children)
+                    foreach (var child in children)
                     {
                         GetDirectory(
                             name, child, searchDepth - 1);
@@ -395,7 +393,7 @@ namespace BDInfo
             //if (!ExcludeDirs.Contains(directoryInfo.Name.ToUpper()))  // TODO: Keep?
             {
                 FileSystemMetadata[] pathFiles = _fileSystem.GetFiles(directoryInfo.FullName).ToArray();
-                foreach (FileSystemMetadata pathFile in pathFiles)
+                foreach (var pathFile in pathFiles)
                 {
                     if (pathFile.Extension.ToUpper() == ".SSIF")
                     {
@@ -405,7 +403,7 @@ namespace BDInfo
                 }
 
                 FileSystemMetadata[] pathChildren = _fileSystem.GetDirectories(directoryInfo.FullName).ToArray();
-                foreach (FileSystemMetadata pathChild in pathChildren)
+                foreach (var pathChild in pathChildren)
                 {
                     size += GetDirectorySize(pathChild);
                 }

BDInfo/LanguageCodes.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //

BDInfo/Properties/AssemblyInfo.cs

@@ -1,29 +1,21 @@
-using System.Resources;
 using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Resources;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("BDInfo")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Jellyfin Project")]
-[assembly: AssemblyProduct("BDInfo")]
+[assembly: AssemblyProduct("Jellyfin: The Free Software Media System")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2016 CinemaSquid. Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License Version 2")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
 
-// Version information for an assembly consists of the following four values:
+// Setting ComVisible to false makes the types in this assembly not visible
-//
+// to COM components.  If you need to access a type in this assembly from
-//      Major Version
+// COM, set the ComVisible attribute to true on that type.
-//      Minor Version 
+[assembly: ComVisible(false)]
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1")]

BDInfo/ReadMe.txt

@@ -1,5 +1,5 @@
-The source is taken from the BDRom folder of this project:
+The source is taken from the BDRom folder of this project:
 
 http://www.cinemasquid.com/blu-ray/tools/bdinfo
 
-BDInfoSettings was taken from the FormSettings class, and changed so that the settings all return defaults.
+BDInfoSettings was taken from the FormSettings class, and changed so that the settings all return defaults.

BDInfo/TSCodecAC3.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -24,7 +24,7 @@ namespace BDInfo
 {
     public abstract class TSCodecAC3
     {
-        private static byte[] eac3_blocks =  new byte[] { 1, 2, 3, 6 };
+        private static byte[] eac3_blocks = new byte[] { 1, 2, 3, 6 };
 
         public static void Scan(
             TSAudioStream stream,

BDInfo/TSCodecAVC.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //

BDInfo/TSCodecDTS.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -148,7 +148,7 @@ namespace BDInfo
                     stream.IsVBR = true;
                     stream.IsInitialized = true;
                     break;
-                
+
                 default:
                     stream.IsVBR = false;
                     stream.IsInitialized = true;

BDInfo/TSCodecDTSHD.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -22,9 +22,9 @@ namespace BDInfo
 {
     public abstract class TSCodecDTSHD
     {
-        private static int[] SampleRates = new int[] 
+        private static int[] SampleRates = new int[]
         { 0x1F40, 0x3E80, 0x7D00, 0x0FA00, 0x1F400, 0x5622, 0x0AC44, 0x15888, 0x2B110, 0x56220, 0x2EE0, 0x5DC0, 0x0BB80, 0x17700, 0x2EE00, 0x5DC00 };
-        
+
         public static void Scan(
             TSAudioStream stream,
             TSStreamBuffer buffer,
@@ -131,7 +131,7 @@ namespace BDInfo
                 else
                 {
                     AssetSizes[i] = buffer.ReadBits(16) + 1;
-                }                
+                }
             }
             for (int i = 0; i < nuNumAssets; i++)
             {
@@ -189,7 +189,7 @@ namespace BDInfo
                     }
                     stream.SampleRate = SampleRates[nuMaxSampleRate];
                     stream.BitDepth = nuBitResolution;
-                    
+
                     stream.LFE = 0;
                     if ((nuSpkrActivityMask & 0x8) == 0x8)
                     {
@@ -211,7 +211,7 @@ namespace BDInfo
             // TODO
             if (stream.CoreStream != null)
             {
-                TSAudioStream coreStream = (TSAudioStream)stream.CoreStream;
+                var coreStream = (TSAudioStream)stream.CoreStream;
                 if (coreStream.AudioMode == TSAudioMode.Extended &&
                     stream.ChannelCount == 5)
                 {
@@ -240,7 +240,7 @@ namespace BDInfo
                     stream.IsInitialized = true;
                 }
                 stream.IsInitialized = (stream.BitRate > 0 ? true : false);
-            }            
+            }
         }
     }
 }

BDInfo/TSCodecLPCM.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //

BDInfo/TSCodecMPEG2.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -33,7 +33,7 @@ namespace BDInfo
             int pictureParse = 0;
             int sequenceHeaderParse = 0;
             int extensionParse = 0;
-            int sequenceExtensionParse = 0;            
+            int sequenceExtensionParse = 0;
 
             for (int i = 0; i < buffer.Length; i++)
             {
@@ -189,7 +189,7 @@ namespace BDInfo
 #if DEBUG
                     if (sequenceExtensionParse == 0)
                     {
-                        uint sequenceExtension = 
+                        uint sequenceExtension =
                             ((parse & 0x8) >> 3);
                         if (sequenceExtension == 0)
                         {

BDInfo/TSCodecMVC.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //

BDInfo/TSCodecTrueHD.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -36,7 +36,7 @@ namespace BDInfo
             for (int i = 0; i < buffer.Length; i++)
             {
                 sync = (sync << 8) + buffer.ReadByte();
-                if (sync == 0xF8726FBA) 
+                if (sync == 0xF8726FBA)
                 {
                     syncFound = true;
                     break;
@@ -63,7 +63,7 @@ namespace BDInfo
             int ratebits = buffer.ReadBits(4);
             if (ratebits != 0xF)
             {
-                stream.SampleRate = 
+                stream.SampleRate =
                     (((ratebits & 8) > 0 ? 44100 : 48000) << (ratebits & 7));
             }
             int temp1 = buffer.ReadBits(8);
@@ -149,9 +149,9 @@ namespace BDInfo
             int peak_bitrate = buffer.ReadBits(15);
             peak_bitrate = (peak_bitrate * stream.SampleRate) >> 4;
 
-            double peak_bitdepth = 
+            double peak_bitdepth =
-                (double)peak_bitrate / 
+                (double)peak_bitrate /
-                (stream.ChannelCount + stream.LFE) / 
+                (stream.ChannelCount + stream.LFE) /
                 stream.SampleRate;
             if (peak_bitdepth > 14)
             {
@@ -164,7 +164,7 @@ namespace BDInfo
 
 #if DEBUG
             System.Diagnostics.Debug.WriteLine(string.Format(
-                "{0}\t{1}\t{2:F2}", 
+                "{0}\t{1}\t{2:F2}",
                 stream.PID, peak_bitrate, peak_bitdepth));
 #endif
             /*

BDInfo/TSCodecVC1.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -50,18 +50,18 @@ namespace BDInfo
                         {
                             if ((parse & 0x80000000) == 0)
                             {
-                                pictureType = 
+                                pictureType =
                                     (uint)((parse & 0x78000000) >> 13);
                             }
                             else
                             {
-                                pictureType = 
+                                pictureType =
                                     (uint)((parse & 0x3c000000) >> 12);
                             }
                         }
                         else
                         {
-                            pictureType = 
+                            pictureType =
                                 (uint)((parse & 0xf0000000) >> 14);
                         }
 

BDInfo/TSInterleavedFile.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -17,7 +17,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //=============================================================================
 
-using System.IO;
 using MediaBrowser.Model.IO;
 
 // TODO: Do more interesting things here...

BDInfo/TSPlaylistFile.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -23,14 +23,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Text;
 
 namespace BDInfo
 {
     public class TSPlaylistFile
     {
         private readonly IFileSystem _fileSystem;
-        private readonly ITextEncoding _textEncoding;
         private FileSystemMetadata FileInfo = null;
         public string FileType = null;
         public bool IsInitialized = false;
@@ -42,7 +40,7 @@ namespace BDInfo
 
         public List<double> Chapters = new List<double>();
 
-        public Dictionary<ushort, TSStream> Streams = 
+        public Dictionary<ushort, TSStream> Streams =
             new Dictionary<ushort, TSStream>();
         public Dictionary<ushort, TSStream> PlaylistStreams =
             new Dictionary<ushort, TSStream>();
@@ -50,45 +48,41 @@ namespace BDInfo
             new List<TSStreamClip>();
         public List<Dictionary<ushort, TSStream>> AngleStreams =
             new List<Dictionary<ushort, TSStream>>();
-        public List<Dictionary<double, TSStreamClip>> AngleClips = 
+        public List<Dictionary<double, TSStreamClip>> AngleClips =
             new List<Dictionary<double, TSStreamClip>>();
         public int AngleCount = 0;
 
-        public List<TSStream> SortedStreams = 
+        public List<TSStream> SortedStreams =
             new List<TSStream>();
-        public List<TSVideoStream> VideoStreams = 
+        public List<TSVideoStream> VideoStreams =
             new List<TSVideoStream>();
-        public List<TSAudioStream> AudioStreams = 
+        public List<TSAudioStream> AudioStreams =
             new List<TSAudioStream>();
-        public List<TSTextStream> TextStreams = 
+        public List<TSTextStream> TextStreams =
             new List<TSTextStream>();
-        public List<TSGraphicsStream> GraphicsStreams = 
+        public List<TSGraphicsStream> GraphicsStreams =
             new List<TSGraphicsStream>();
 
-        public TSPlaylistFile(
+        public TSPlaylistFile(BDROM bdrom,
-            BDROM bdrom,
+            FileSystemMetadata fileInfo, IFileSystem fileSystem)
-            FileSystemMetadata fileInfo, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             BDROM = bdrom;
             FileInfo = fileInfo;
             _fileSystem = fileSystem;
-            _textEncoding = textEncoding;
             Name = fileInfo.Name.ToUpper();
         }
 
-        public TSPlaylistFile(
+        public TSPlaylistFile(BDROM bdrom,
-            BDROM bdrom,
             string name,
-            List<TSStreamClip> clips, IFileSystem fileSystem, ITextEncoding textEncoding)
+            List<TSStreamClip> clips, IFileSystem fileSystem)
         {
             BDROM = bdrom;
             Name = name;
             _fileSystem = fileSystem;
-            _textEncoding = textEncoding;
             IsCustom = true;
-            foreach (TSStreamClip clip in clips)
+            foreach (var clip in clips)
             {
-                TSStreamClip newClip = new TSStreamClip(
+                var newClip = new TSStreamClip(
                     clip.StreamFile, clip.StreamClipFile);
 
                 newClip.Name = clip.Name;
@@ -124,7 +118,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     size += clip.InterleavedFileSize;
                 }
@@ -136,7 +130,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     size += clip.FileSize;
                 }
@@ -148,7 +142,7 @@ namespace BDInfo
             get
             {
                 double length = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     if (clip.AngleIndex == 0)
                     {
@@ -164,7 +158,7 @@ namespace BDInfo
             get
             {
                 double length = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     length += clip.Length;
                 }
@@ -177,7 +171,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     if (clip.AngleIndex == 0)
                     {
@@ -193,7 +187,7 @@ namespace BDInfo
             get
             {
                 ulong size = 0;
-                foreach (TSStreamClip clip in StreamClips)
+                foreach (var clip in StreamClips)
                 {
                     size += clip.PacketSize;
                 }
@@ -237,7 +231,7 @@ namespace BDInfo
                 Streams.Clear();
                 StreamClips.Clear();
 
-                fileStream = _fileSystem.OpenRead(FileInfo.FullName);
+                fileStream = File.OpenRead(FileInfo.FullName);
                 fileReader = new BinaryReader(fileStream);
 
                 byte[] data = new byte[fileStream.Length];
@@ -264,7 +258,7 @@ namespace BDInfo
                 int itemCount = ReadInt16(data, ref pos);
                 int subitemCount = ReadInt16(data, ref pos);
 
-                List<TSStreamClip> chapterClips = new List<TSStreamClip>();
+                var chapterClips = new List<TSStreamClip>();
                 for (int itemIndex = 0; itemIndex < itemCount; itemIndex++)
                 {
                     int itemStart = pos;
@@ -311,7 +305,7 @@ namespace BDInfo
                     if (outTime < 0) outTime &= 0x7FFFFFFF;
                     double timeOut = (double)outTime / 45000;
 
-                    TSStreamClip streamClip = new TSStreamClip(
+                    var streamClip = new TSStreamClip(
                         streamFile, streamClipFile);
 
                     streamClip.Name = streamFileName; //TODO
@@ -362,7 +356,7 @@ namespace BDInfo
                                     FileInfo.Name, angleClipFileName));
                             }
 
-                            TSStreamClip angleClip =
+                            var angleClip =
                                 new TSStreamClip(angleFile, angleClipFile);
                             angleClip.AngleIndex = angle + 1;
                             angleClip.TimeIn = streamClip.TimeIn;
@@ -388,46 +382,46 @@ namespace BDInfo
 
 #if DEBUG
                     Debug.WriteLine(string.Format(
-                        "{0} : {1} -> V:{2} A:{3} PG:{4} IG:{5} 2A:{6} 2V:{7} PIP:{8}", 
+                        "{0} : {1} -> V:{2} A:{3} PG:{4} IG:{5} 2A:{6} 2V:{7} PIP:{8}",
-                        Name, streamFileName, streamCountVideo, streamCountAudio, streamCountPG, streamCountIG, 
+                        Name, streamFileName, streamCountVideo, streamCountAudio, streamCountPG, streamCountIG,
                         streamCountSecondaryAudio, streamCountSecondaryVideo, streamCountPIP));
 #endif
 
                     for (int i = 0; i < streamCountVideo; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountAudio; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountPG; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountIG; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                     }
                     for (int i = 0; i < streamCountSecondaryAudio; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                         pos += 2;
                     }
                     for (int i = 0; i < streamCountSecondaryVideo; i++)
                     {
-                        TSStream stream = CreatePlaylistStream(data, ref pos);
+                        var stream = CreatePlaylistStream(data, ref pos);
                         if (stream != null) PlaylistStreams[stream.PID] = stream;
                         pos += 6;
                     }
                     /*
                      * TODO
-                     * 
+                     *
                     for (int i = 0; i < streamCountPIP; i++)
                     {
                         TSStream stream = CreatePlaylistStream(data, ref pos);
@@ -446,7 +440,7 @@ namespace BDInfo
                     chapterIndex < chapterCount;
                     chapterIndex++)
                 {
-                    int chapterType = data[pos+1];
+                    int chapterType = data[pos + 1];
 
                     if (chapterType == 1)
                     {
@@ -459,7 +453,7 @@ namespace BDInfo
                             ((long)data[pos + 6] << 8) +
                             ((long)data[pos + 7]);
 
-                        TSStreamClip streamClip = chapterClips[streamFileIndex];
+                        var streamClip = chapterClips[streamFileIndex];
 
                         double chapterSeconds = (double)chapterTime / 45000;
 
@@ -499,8 +493,8 @@ namespace BDInfo
         {
             LoadStreamClips();
 
-            Dictionary<string, List<double>> clipTimes = new Dictionary<string, List<double>>();
+            var clipTimes = new Dictionary<string, List<double>>();
-            foreach (TSStreamClip clip in StreamClips)
+            foreach (var clip in StreamClips)
             {
                 if (clip.AngleIndex == 0)
                 {
@@ -568,7 +562,7 @@ namespace BDInfo
             int streamLength = data[pos++];
             int streamPos = pos;
 
-            TSStreamType streamType = (TSStreamType)data[pos++];
+            var streamType = (TSStreamType)data[pos++];
             switch (streamType)
             {
                 case TSStreamType.MVC_VIDEO:
@@ -580,11 +574,11 @@ namespace BDInfo
                 case TSStreamType.MPEG2_VIDEO:
                 case TSStreamType.VC1_VIDEO:
 
-                    TSVideoFormat videoFormat = (TSVideoFormat)
+                    var videoFormat = (TSVideoFormat)
                         (data[pos] >> 4);
-                    TSFrameRate frameRate = (TSFrameRate)
+                    var frameRate = (TSFrameRate)
                         (data[pos] & 0xF);
-                    TSAspectRatio aspectRatio = (TSAspectRatio)
+                    var aspectRatio = (TSAspectRatio)
                         (data[pos + 1] >> 4);
 
                     stream = new TSVideoStream();
@@ -618,9 +612,9 @@ namespace BDInfo
 
                     int audioFormat = ReadByte(data, ref pos);
 
-                    TSChannelLayout channelLayout = (TSChannelLayout)
+                    var channelLayout = (TSChannelLayout)
                         (audioFormat >> 4);
-                    TSSampleRate sampleRate = (TSSampleRate)
+                    var sampleRate = (TSSampleRate)
                         (audioFormat & 0xF);
 
                     string audioLanguage = ReadString(data, 3, ref pos);
@@ -713,7 +707,7 @@ namespace BDInfo
             {
                 referenceClip = StreamClips[0];
             }
-            foreach (TSStreamClip clip in StreamClips)
+            foreach (var clip in StreamClips)
             {
                 if (clip.StreamClipFile.Streams.Count > referenceClip.StreamClipFile.Streams.Count)
                 {
@@ -739,12 +733,12 @@ namespace BDInfo
                 }
             }
 
-            foreach (TSStream clipStream
+            foreach (var clipStream
                 in referenceClip.StreamClipFile.Streams.Values)
             {
                 if (!Streams.ContainsKey(clipStream.PID))
                 {
-                    TSStream stream = clipStream.Clone();
+                    var stream = clipStream.Clone();
                     Streams[clipStream.PID] = stream;
 
                     if (!IsCustom && !PlaylistStreams.ContainsKey(stream.PID))
@@ -780,7 +774,7 @@ namespace BDInfo
                     referenceClip.StreamFile.Streams.ContainsKey(4114) &&
                     !Streams.ContainsKey(4114))
                 {
-                    TSStream stream = referenceClip.StreamFile.Streams[4114].Clone();
+                    var stream = referenceClip.StreamFile.Streams[4114].Clone();
                     Streams[4114] = stream;
                     if (stream.IsVideoStream)
                     {
@@ -788,12 +782,12 @@ namespace BDInfo
                     }
                 }
 
-                foreach (TSStream clipStream
+                foreach (var clipStream
                     in referenceClip.StreamFile.Streams.Values)
                 {
                     if (Streams.ContainsKey(clipStream.PID))
                     {
-                        TSStream stream = Streams[clipStream.PID];
+                        var stream = Streams[clipStream.PID];
 
                         if (stream.StreamType != clipStream.StreamType) continue;
 
@@ -812,8 +806,8 @@ namespace BDInfo
                         else if (stream.IsAudioStream &&
                             clipStream.IsAudioStream)
                         {
-                            TSAudioStream audioStream = (TSAudioStream)stream;
+                            var audioStream = (TSAudioStream)stream;
-                            TSAudioStream clipAudioStream = (TSAudioStream)clipStream;
+                            var clipAudioStream = (TSAudioStream)clipStream;
 
                             if (clipAudioStream.ChannelCount > audioStream.ChannelCount)
                             {
@@ -864,7 +858,7 @@ namespace BDInfo
                 SortedStreams.Add(stream);
                 for (int i = 0; i < AngleCount; i++)
                 {
-                    TSStream angleStream = stream.Clone();
+                    var angleStream = stream.Clone();
                     angleStream.AngleIndex = i + 1;
                     AngleStreams[i][angleStream.PID] = angleStream;
                     SortedStreams.Add(angleStream);
@@ -901,7 +895,7 @@ namespace BDInfo
 
         public void ClearBitrates()
         {
-            foreach (TSStreamClip clip in StreamClips)
+            foreach (var clip in StreamClips)
             {
                 clip.PayloadBytes = 0;
                 clip.PacketCount = 0;
@@ -909,7 +903,7 @@ namespace BDInfo
 
                 if (clip.StreamFile != null)
                 {
-                    foreach (TSStream stream in clip.StreamFile.Streams.Values)
+                    foreach (var stream in clip.StreamFile.Streams.Values)
                     {
                         stream.PayloadBytes = 0;
                         stream.PacketCount = 0;
@@ -924,7 +918,7 @@ namespace BDInfo
                 }
             }
 
-            foreach (TSStream stream in SortedStreams)
+            foreach (var stream in SortedStreams)
             {
                 stream.PayloadBytes = 0;
                 stream.PacketCount = 0;
@@ -955,7 +949,7 @@ namespace BDInfo
         }
 
         public int CompareVideoStreams(
-            TSVideoStream x, 
+            TSVideoStream x,
             TSVideoStream y)
         {
             if (x == null && y == null)
@@ -996,7 +990,7 @@ namespace BDInfo
         }
 
         public int CompareAudioStreams(
-            TSAudioStream x, 
+            TSAudioStream x,
             TSAudioStream y)
         {
             if (x == y)
@@ -1246,8 +1240,7 @@ namespace BDInfo
             int count,
             ref int pos)
         {
-            string val =
+            string val = Encoding.ASCII.GetString(data, pos, count);
-                _textEncoding.GetASCIIEncoding().GetString(data, pos, count);
 
             pos += count;
 

BDInfo/TSStream.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -109,7 +109,7 @@ namespace BDInfo
 
         public TSDescriptor Clone()
         {
-            TSDescriptor descriptor = 
+            var descriptor =
                 new TSDescriptor(Name, (byte)Value.Length);
             Value.CopyTo(descriptor.Value, 0);
             return descriptor;
@@ -142,26 +142,17 @@ namespace BDInfo
         public double PacketSeconds = 0;
         public int AngleIndex = 0;
 
-        public ulong PacketSize
+        public ulong PacketSize => PacketCount * 192;
-        {
-            get
-            {
-                return PacketCount * 192;
-            }
-        }
 
         private string _LanguageCode;
         public string LanguageCode
         {
-            get 
+            get => _LanguageCode;
-            {
+            set
-                return _LanguageCode; 
-            }
-            set 
             {
                 _LanguageCode = value;
                 LanguageName = LanguageCodes.GetName(value);
-            } 
+            }
         }
 
         public bool IsVideoStream
@@ -398,16 +389,10 @@ namespace BDInfo
             }
         }
 
-        public virtual string Description
+        public virtual string Description => "";
-        {
-            get
-            {
-                return "";
-            }
-        }
 
         public abstract TSStream Clone();
-        
+
         protected void CopyTo(TSStream stream)
         {
             stream.PID = PID;
@@ -419,7 +404,7 @@ namespace BDInfo
             if (Descriptors != null)
             {
                 stream.Descriptors = new List<TSDescriptor>();
-                foreach (TSDescriptor descriptor in Descriptors)
+                foreach (var descriptor in Descriptors)
                 {
                     stream.Descriptors.Add(descriptor.Clone());
                 }
@@ -435,7 +420,7 @@ namespace BDInfo
 
         public int Width;
         public int Height;
-        public bool IsInterlaced;        
+        public bool IsInterlaced;
         public int FrameRateEnumerator;
         public int FrameRateDenominator;
         public TSAspectRatio AspectRatio;
@@ -444,10 +429,7 @@ namespace BDInfo
         private TSVideoFormat _VideoFormat;
         public TSVideoFormat VideoFormat
         {
-            get
+            get => _VideoFormat;
-            {
-                return _VideoFormat;
-            }
             set
             {
                 _VideoFormat = value;
@@ -488,10 +470,7 @@ namespace BDInfo
         private TSFrameRate _FrameRate;
         public TSFrameRate FrameRate
         {
-            get
+            get => _FrameRate;
-            {
-                return _FrameRate;
-            }
             set
             {
                 _FrameRate = value;
@@ -574,14 +553,14 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSVideoStream stream = new TSVideoStream();
+            var stream = new TSVideoStream();
             CopyTo(stream);
 
             stream.VideoFormat = _VideoFormat;
             stream.FrameRate = _FrameRate;
             stream.Width = Width;
             stream.Height = Height;
-            stream.IsInterlaced = IsInterlaced;        
+            stream.IsInterlaced = IsInterlaced;
             stream.FrameRateEnumerator = FrameRateEnumerator;
             stream.FrameRateDenominator = FrameRateDenominator;
             stream.AspectRatio = AspectRatio;
@@ -748,7 +727,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSAudioStream stream = new TSAudioStream();
+            var stream = new TSAudioStream();
             CopyTo(stream);
 
             stream.SampleRate = SampleRate;
@@ -777,7 +756,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSGraphicsStream stream = new TSGraphicsStream();
+            var stream = new TSGraphicsStream();
             CopyTo(stream);
             return stream;
         }
@@ -793,7 +772,7 @@ namespace BDInfo
 
         public override TSStream Clone()
         {
-            TSTextStream stream = new TSTextStream();
+            var stream = new TSTextStream();
             CopyTo(stream);
             return stream;
         }

BDInfo/TSStreamBuffer.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -37,21 +37,9 @@ namespace BDInfo
             Stream = new MemoryStream(Buffer);
         }
 
-        public long Length
+        public long Length => (long)BufferLength;
-        {
-            get
-            {
-                return (long)BufferLength;
-            }
-        }
 
-        public long Position
+        public long Position => Stream.Position;
-        {
-            get
-            {
-                return Stream.Position;
-            }
-        }
 
         public void Add(
             byte[] buffer,
@@ -123,7 +111,7 @@ namespace BDInfo
                 data += (Stream.ReadByte() << shift);
                 shift -= 8;
             }
-            BitVector32 vector = new BitVector32(data);
+            var vector = new BitVector32(data);
 
             int value = 0;
             for (int i = SkipBits; i < SkipBits + bits; i++)

BDInfo/TSStreamClip.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -74,13 +74,7 @@ namespace BDInfo
             }
         }
 
-        public ulong PacketSize
+        public ulong PacketSize => PacketCount * 192;
-        {
-            get
-            {
-                return PacketCount * 192;
-            }
-        }
 
         public ulong PacketBitRate
         {
@@ -96,11 +90,11 @@ namespace BDInfo
 
         public bool IsCompatible(TSStreamClip clip)
         {
-            foreach (TSStream stream1 in StreamFile.Streams.Values)
+            foreach (var stream1 in StreamFile.Streams.Values)
             {
                 if (clip.StreamFile.Streams.ContainsKey(stream1.PID))
                 {
-                    TSStream stream2 = clip.StreamFile.Streams[stream1.PID];
+                    var stream2 = clip.StreamFile.Streams[stream1.PID];
                     if (stream1.StreamType != stream2.StreamType)
                     {
                         return false;

BDInfo/TSStreamClipFile.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -23,28 +23,24 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Text;
 
 namespace BDInfo
 {
     public class TSStreamClipFile
     {
         private readonly IFileSystem _fileSystem;
-        private readonly ITextEncoding _textEncoding;
         public FileSystemMetadata FileInfo = null;
         public string FileType = null;
         public bool IsValid = false;
         public string Name = null;
 
         public Dictionary<ushort, TSStream> Streams =
-            new Dictionary<ushort,TSStream>();
+            new Dictionary<ushort, TSStream>();
 
-        public TSStreamClipFile(
+        public TSStreamClipFile(FileSystemMetadata fileInfo, IFileSystem fileSystem)
-            FileSystemMetadata fileInfo, IFileSystem fileSystem, ITextEncoding textEncoding)
         {
             FileInfo = fileInfo;
             _fileSystem = fileSystem;
-            _textEncoding = textEncoding;
             Name = fileInfo.Name.ToUpper();
         }
 
@@ -61,7 +57,7 @@ namespace BDInfo
 #endif
                 Streams.Clear();
 
-                fileStream = _fileSystem.OpenRead(FileInfo.FullName);
+                fileStream = File.OpenRead(FileInfo.FullName);
                 fileReader = new BinaryReader(fileStream);
 
                 byte[] data = new byte[fileStream.Length];
@@ -69,8 +65,8 @@ namespace BDInfo
 
                 byte[] fileType = new byte[8];
                 Array.Copy(data, 0, fileType, 0, fileType.Length);
-                
+
-                FileType = _textEncoding.GetASCIIEncoding().GetString(fileType, 0, fileType.Length);
+                FileType = Encoding.ASCII.GetString(fileType, 0, fileType.Length);
                 if (FileType != "HDMV0100" &&
                     FileType != "HDMV0200")
                 {
@@ -78,7 +74,7 @@ namespace BDInfo
                         "Clip info file {0} has an unknown file type {1}.",
                         FileInfo.Name, FileType));
                 }
-#if DEBUG                
+#if DEBUG
                 Debug.WriteLine(string.Format(
                     "\tFileType: {0}", FileType));
 #endif
@@ -110,12 +106,12 @@ namespace BDInfo
                     TSStream stream = null;
 
                     ushort PID = (ushort)
-                        ((clipData[streamOffset] << 8) + 
+                        ((clipData[streamOffset] << 8) +
                           clipData[streamOffset + 1]);
-                    
+
                     streamOffset += 2;
 
-                    TSStreamType streamType = (TSStreamType)
+                    var streamType = (TSStreamType)
                         clipData[streamOffset + 1];
                     switch (streamType)
                     {
@@ -127,18 +123,18 @@ namespace BDInfo
                         case TSStreamType.MPEG1_VIDEO:
                         case TSStreamType.MPEG2_VIDEO:
                         case TSStreamType.VC1_VIDEO:
-                        {
+                            {
-                            TSVideoFormat videoFormat = (TSVideoFormat)
+                                var videoFormat = (TSVideoFormat)
-                                (clipData[streamOffset + 2] >> 4);
+                                    (clipData[streamOffset + 2] >> 4);
-                            TSFrameRate frameRate = (TSFrameRate)
+                                var frameRate = (TSFrameRate)
-                                (clipData[streamOffset + 2] & 0xF);
+                                    (clipData[streamOffset + 2] & 0xF);
-                            TSAspectRatio aspectRatio = (TSAspectRatio)
+                                var aspectRatio = (TSAspectRatio)
-                                (clipData[streamOffset + 3] >> 4);
+                                    (clipData[streamOffset + 3] >> 4);
 
-                            stream = new TSVideoStream();
+                                stream = new TSVideoStream();
-                            ((TSVideoStream)stream).VideoFormat = videoFormat;
+                                ((TSVideoStream)stream).VideoFormat = videoFormat;
-                            ((TSVideoStream)stream).AspectRatio = aspectRatio;
+                                ((TSVideoStream)stream).AspectRatio = aspectRatio;
-                            ((TSVideoStream)stream).FrameRate = frameRate;
+                                ((TSVideoStream)stream).FrameRate = frameRate;
 #if DEBUG
                             Debug.WriteLine(string.Format(
                                 "\t{0} {1} {2} {3} {4}",
@@ -148,8 +144,8 @@ namespace BDInfo
                                 frameRate,
                                 aspectRatio));
 #endif
-                        }
+                            }
-                        break;
+                            break;
 
                         case TSStreamType.AC3_AUDIO:
                         case TSStreamType.AC3_PLUS_AUDIO:
@@ -162,23 +158,22 @@ namespace BDInfo
                         case TSStreamType.LPCM_AUDIO:
                         case TSStreamType.MPEG1_AUDIO:
                         case TSStreamType.MPEG2_AUDIO:
-                        {
+                            {
-                            byte[] languageBytes = new byte[3];
+                                byte[] languageBytes = new byte[3];
-                            Array.Copy(clipData, streamOffset + 3,
+                                Array.Copy(clipData, streamOffset + 3,
-                                languageBytes, 0, languageBytes.Length);
+                                    languageBytes, 0, languageBytes.Length);
-                            string languageCode =
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
-                                _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 
-                            TSChannelLayout channelLayout = (TSChannelLayout)
+                                var channelLayout = (TSChannelLayout)
-                                (clipData[streamOffset + 2] >> 4);
+                                    (clipData[streamOffset + 2] >> 4);
-                            TSSampleRate sampleRate = (TSSampleRate)
+                                var sampleRate = (TSSampleRate)
-                                (clipData[streamOffset + 2] & 0xF);
+                                    (clipData[streamOffset + 2] & 0xF);
 
-                            stream = new TSAudioStream();
+                                stream = new TSAudioStream();
-                            ((TSAudioStream)stream).LanguageCode = languageCode;
+                                ((TSAudioStream)stream).LanguageCode = languageCode;
-                            ((TSAudioStream)stream).ChannelLayout = channelLayout;
+                                ((TSAudioStream)stream).ChannelLayout = channelLayout;
-                            ((TSAudioStream)stream).SampleRate = TSAudioStream.ConvertSampleRate(sampleRate);
+                                ((TSAudioStream)stream).SampleRate = TSAudioStream.ConvertSampleRate(sampleRate);
-                            ((TSAudioStream)stream).LanguageCode = languageCode;
+                                ((TSAudioStream)stream).LanguageCode = languageCode;
 #if DEBUG
                             Debug.WriteLine(string.Format(
                                 "\t{0} {1} {2} {3} {4}",
@@ -188,20 +183,19 @@ namespace BDInfo
                                 channelLayout,
                                 sampleRate));
 #endif
-                        }
+                            }
-                        break;
+                            break;
 
                         case TSStreamType.INTERACTIVE_GRAPHICS:
                         case TSStreamType.PRESENTATION_GRAPHICS:
-                        {
+                            {
-                            byte[] languageBytes = new byte[3];
+                                byte[] languageBytes = new byte[3];
-                            Array.Copy(clipData, streamOffset + 2,
+                                Array.Copy(clipData, streamOffset + 2,
-                                languageBytes, 0, languageBytes.Length);
+                                    languageBytes, 0, languageBytes.Length);
-                            string languageCode =
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
-                                _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 
                                 stream = new TSGraphicsStream();
-                            stream.LanguageCode = languageCode;
+                                stream.LanguageCode = languageCode;
 #if DEBUG
                             Debug.WriteLine(string.Format(
                                 "\t{0} {1} {2}",
@@ -209,16 +203,15 @@ namespace BDInfo
                                 streamType,
                                 languageCode));
 #endif
-                        }
+                            }
-                        break;
+                            break;
 
                         case TSStreamType.SUBTITLE:
-                        {
+                            {
-                            byte[] languageBytes = new byte[3];
+                                byte[] languageBytes = new byte[3];
-                            Array.Copy(clipData, streamOffset + 3,
+                                Array.Copy(clipData, streamOffset + 3,
-                                languageBytes, 0, languageBytes.Length);
+                                    languageBytes, 0, languageBytes.Length);
-                            string languageCode =
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
-                                _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
 #if DEBUG
                             Debug.WriteLine(string.Format(
                                 "\t{0} {1} {2}",
@@ -227,9 +220,9 @@ namespace BDInfo
                                 languageCode));
 #endif
                                 stream = new TSTextStream();
-                            stream.LanguageCode = languageCode;
+                                stream.LanguageCode = languageCode;
-                        }
+                            }
-                        break;
+                            break;
                     }
 
                     if (stream != null)
@@ -240,7 +233,7 @@ namespace BDInfo
                     }
 
                     streamOffset += clipData[streamOffset] + 1;
-                }                
+                }
                 IsValid = true;
             }
             finally

BDInfo/TSStreamFile.cs

@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -283,7 +283,7 @@ namespace BDInfo
 
             bool isAVC = false;
             bool isMVC = false;
-            foreach (TSStream finishedStream in Streams.Values)
+            foreach (var finishedStream in Streams.Values)
             {
                 if (!finishedStream.IsInitialized)
                 {
@@ -327,10 +327,10 @@ namespace BDInfo
                 UpdateStreamBitrate(PID, PTSPID, PTS, PTSDiff);
             }
 
-            foreach (TSPlaylistFile playlist in Playlists)
+            foreach (var playlist in Playlists)
             {
                 double packetSeconds = 0;
-                foreach (TSStreamClip clip in playlist.StreamClips)
+                foreach (var clip in playlist.StreamClips)
                 {
                     if (clip.AngleIndex == 0)
                     {
@@ -339,7 +339,7 @@ namespace BDInfo
                 }
                 if (packetSeconds > 0)
                 {
-                    foreach (TSStream playlistStream in playlist.SortedStreams)
+                    foreach (var playlistStream in playlist.SortedStreams)
                     {
                         if (playlistStream.IsVBR)
                         {
@@ -366,14 +366,14 @@ namespace BDInfo
         {
             if (Playlists == null) return;
 
-            TSStreamState streamState = StreamStates[PID];
+            var streamState = StreamStates[PID];
             double streamTime = (double)PTS / 90000;
             double streamInterval = (double)PTSDiff / 90000;
             double streamOffset = streamTime + streamInterval;
 
-            foreach (TSPlaylistFile playlist in Playlists)
+            foreach (var playlist in Playlists)
             {
-                foreach (TSStreamClip clip in playlist.StreamClips)
+                foreach (var clip in playlist.StreamClips)
                 {
                     if (clip.Name != this.Name) continue;
 
@@ -390,15 +390,15 @@ namespace BDInfo
                             clip.PacketSeconds = streamOffset - clip.TimeIn;
                         }
 
-                        Dictionary<ushort, TSStream> playlistStreams = playlist.Streams;
+                        var playlistStreams = playlist.Streams;
-                        if (clip.AngleIndex > 0 && 
+                        if (clip.AngleIndex > 0 &&
                             clip.AngleIndex < playlist.AngleStreams.Count + 1)
                         {
                             playlistStreams = playlist.AngleStreams[clip.AngleIndex - 1];
                         }
                         if (playlistStreams.ContainsKey(PID))
                         {
-                            TSStream stream = playlistStreams[PID];
+                            var stream = playlistStreams[PID];
 
                             stream.PayloadBytes += streamState.WindowBytes;
                             stream.PacketCount += streamState.WindowPackets;
@@ -425,13 +425,13 @@ namespace BDInfo
 
             if (Streams.ContainsKey(PID))
             {
-                TSStream stream = Streams[PID];
+                var stream = Streams[PID];
                 stream.PayloadBytes += streamState.WindowBytes;
                 stream.PacketCount += streamState.WindowPackets;
-                
+
                 if (stream.IsVideoStream)
                 {
-                    TSStreamDiagnostics diag = new TSStreamDiagnostics();
+                    var diag = new TSStreamDiagnostics();
                     diag.Marker = (double)PTS / 90000;
                     diag.Interval = (double)PTSDiff / 90000;
                     diag.Bytes = streamState.WindowBytes;
@@ -457,7 +457,7 @@ namespace BDInfo
             int dataSize = 16384;
             Stream fileStream = null;
             try
-            {                
+            {
                 string fileName;
                 if (BDInfoSettings.EnableSSIF &&
                     InterleavedFile != null)
@@ -482,13 +482,13 @@ namespace BDInfo
                 StreamStates.Clear();
                 StreamDiagnostics.Clear();
 
-                TSPacketParser parser = 
+                var parser =
                     new TSPacketParser();
-                
+
                 long fileLength = (uint)fileStream.Length;
                 byte[] buffer = new byte[dataSize];
                 int bufferLength = 0;
-                while ((bufferLength = 
+                while ((bufferLength =
                     fileStream.Read(buffer, 0, buffer.Length)) > 0)
                 {
                     int offset = 0;
@@ -536,80 +536,80 @@ namespace BDInfo
                             switch (parser.HeaderParse)
                             {
                                 case 2:
-                                {
+                                    {
-                                    parser.TransportErrorIndicator =
+                                        parser.TransportErrorIndicator =
-                                        (byte)((buffer[i] >> 7) & 0x1);
+                                            (byte)((buffer[i] >> 7) & 0x1);
-                                    parser.PayloadUnitStartIndicator =
+                                        parser.PayloadUnitStartIndicator =
-                                        (byte)((buffer[i] >> 6) & 0x1);
+                                            (byte)((buffer[i] >> 6) & 0x1);
-                                    parser.TransportPriority =
+                                        parser.TransportPriority =
-                                        (byte)((buffer[i] >> 5) & 0x1);
+                                            (byte)((buffer[i] >> 5) & 0x1);
-                                    parser.PID =
+                                        parser.PID =
-                                        (ushort)((buffer[i] & 0x1f) << 8);
+                                            (ushort)((buffer[i] & 0x1f) << 8);
-                                }
+                                    }
-                                break;
+                                    break;
 
                                 case 1:
-                                {
-                                    parser.PID |= (ushort)buffer[i];
-                                    if (Streams.ContainsKey(parser.PID))
                                     {
-                                        parser.Stream = Streams[parser.PID];
+                                        parser.PID |= (ushort)buffer[i];
+                                        if (Streams.ContainsKey(parser.PID))
+                                        {
+                                            parser.Stream = Streams[parser.PID];
+                                        }
+                                        else
+                                        {
+                                            parser.Stream = null;
+                                        }
+                                        if (!StreamStates.ContainsKey(parser.PID))
+                                        {
+                                            StreamStates[parser.PID] = new TSStreamState();
+                                        }
+                                        parser.StreamState = StreamStates[parser.PID];
+                                        parser.StreamState.TotalPackets++;
+                                        parser.StreamState.WindowPackets++;
+                                        parser.TotalPackets++;
                                     }
-                                    else
+                                    break;
-                                    {
-                                        parser.Stream = null;
-                                    }
-                                    if (!StreamStates.ContainsKey(parser.PID))
-                                    {
-                                        StreamStates[parser.PID] = new TSStreamState();
-                                    }
-                                    parser.StreamState = StreamStates[parser.PID];
-                                    parser.StreamState.TotalPackets++;
-                                    parser.StreamState.WindowPackets++;
-                                    parser.TotalPackets++;
-                                }
-                                break;
 
                                 case 0:
-                                {
-                                    parser.TransportScramblingControl =
-                                        (byte)((buffer[i] >> 6) & 0x3);
-                                    parser.AdaptionFieldControl =
-                                        (byte)((buffer[i] >> 4) & 0x3);
-
-                                    if ((parser.AdaptionFieldControl & 0x2) == 0x2)
                                     {
-                                        parser.AdaptionFieldState = true;
+                                        parser.TransportScramblingControl =
-                                    }
+                                            (byte)((buffer[i] >> 6) & 0x3);
-                                    if (parser.PayloadUnitStartIndicator == 1)
+                                        parser.AdaptionFieldControl =
-                                    {
+                                            (byte)((buffer[i] >> 4) & 0x3);
-                                        if (parser.PID == 0)
-                                        {
-                                            parser.PATSectionStart = true;
-                                        }
-                                        else if (parser.PID == parser.PMTPID)
-                                        {
-                                            parser.PMTSectionStart = true;
-                                        }
-                                        else if (parser.StreamState != null &&
-                                            parser.StreamState.TransferState)
-                                        {
-                                            parser.StreamState.TransferState = false;
-                                            parser.StreamState.TransferCount++;
 
-                                            bool isFinished = ScanStream(
+                                        if ((parser.AdaptionFieldControl & 0x2) == 0x2)
-                                                parser.Stream, 
+                                        {
-                                                parser.StreamState, 
+                                            parser.AdaptionFieldState = true;
-                                                parser.StreamState.StreamBuffer);
+                                        }
-
+                                        if (parser.PayloadUnitStartIndicator == 1)
-                                            if (!isFullScan && isFinished)
+                                        {
+                                            if (parser.PID == 0)
                                             {
-                                                return;
+                                                parser.PATSectionStart = true;
+                                            }
+                                            else if (parser.PID == parser.PMTPID)
+                                            {
+                                                parser.PMTSectionStart = true;
+                                            }
+                                            else if (parser.StreamState != null &&
+                                                parser.StreamState.TransferState)
+                                            {
+                                                parser.StreamState.TransferState = false;
+                                                parser.StreamState.TransferCount++;
+
+                                                bool isFinished = ScanStream(
+                                                    parser.Stream,
+                                                    parser.StreamState,
+                                                    parser.StreamState.StreamBuffer);
+
+                                                if (!isFullScan && isFinished)
+                                                {
+                                                    return;
+                                                }
                                             }
                                         }
                                     }
-                                }
+                                    break;
-                                break;
                             }
                         }
                         else if (parser.AdaptionFieldState)
@@ -670,7 +670,8 @@ namespace BDInfo
                                     parser.PAT[parser.PATOffset++] = buffer[i++];
                                     parser.PATSectionLength--;
                                     parser.PacketLength--;
-                                } --i;
+                                }
+                                --i;
 
                                 if (parser.PATSectionLength == 0)
                                 {
@@ -680,10 +681,10 @@ namespace BDInfo
                                         for (int k = 0; k < (parser.PATOffset - 4); k += 4)
                                         {
                                             uint programNumber = (uint)
-                                                ((parser.PAT[k] << 8) +  
+                                                ((parser.PAT[k] << 8) +
                                                   parser.PAT[k + 1]);
 
-                                            ushort programPID = (ushort)                                                 
+                                            ushort programPID = (ushort)
                                                 (((parser.PAT[k + 2] & 0x1F) << 8) +
                                                    parser.PAT[k + 3]);
 
@@ -801,7 +802,8 @@ namespace BDInfo
                                     PMT[parser.PMTOffset++] = buffer[i++];
                                     --parser.PMTSectionLength;
                                     --parser.PacketLength;
-                                } --i;
+                                }
+                                --i;
 
                                 if (parser.PMTSectionLength == 0)
                                 {
@@ -837,7 +839,7 @@ namespace BDInfo
 
                                                 if (!Streams.ContainsKey(streamPID))
                                                 {
-                                                    List<TSDescriptor> streamDescriptors =
+                                                    var streamDescriptors =
                                                         new List<TSDescriptor>();
 
                                                     /*
@@ -985,7 +987,7 @@ namespace BDInfo
                                                 parser.PMTProgramDescriptorLength = buffer[i];
                                                 parser.PMTProgramDescriptors.Add(
                                                     new TSDescriptor(
-                                                        parser.PMTProgramDescriptor, 
+                                                        parser.PMTProgramDescriptor,
                                                         parser.PMTProgramDescriptorLength));
                                                 break;
                                         }
@@ -994,11 +996,11 @@ namespace BDInfo
                                     {
                                         --parser.PMTProgramDescriptorLength;
 
-                                        TSDescriptor descriptor = parser.PMTProgramDescriptors[
+                                        var descriptor = parser.PMTProgramDescriptors[
                                             parser.PMTProgramDescriptors.Count - 1];
 
                                         int valueIndex =
-                                            descriptor.Value.Length - 
+                                            descriptor.Value.Length -
                                             parser.PMTProgramDescriptorLength - 1;
 
                                         descriptor.Value[valueIndex] = buffer[i];
@@ -1020,19 +1022,19 @@ namespace BDInfo
                                 parser.SyncState = false;
                             }
                         }
-                        else if (parser.Stream != null && 
+                        else if (parser.Stream != null &&
-                            parser.StreamState != null && 
+                            parser.StreamState != null &&
                             parser.TransportScramblingControl == 0)
                         {
-                            TSStream stream = parser.Stream;
+                            var stream = parser.Stream;
-                            TSStreamState streamState = parser.StreamState;
+                            var streamState = parser.StreamState;
 
                             streamState.Parse =
                                 (streamState.Parse << 8) + buffer[i];
 
                             if (streamState.TransferState)
                             {
-                                if ((bufferLength - i) >= streamState.PacketLength && 
+                                if ((bufferLength - i) >= streamState.PacketLength &&
                                     streamState.PacketLength > 0)
                                 {
                                     offset = streamState.PacketLength;
@@ -1085,7 +1087,7 @@ namespace BDInfo
                                 --parser.PacketLength;
 
                                 bool headerFound = false;
-                                if (stream.IsVideoStream && 
+                                if (stream.IsVideoStream &&
                                     streamState.Parse == 0x000001FD)
                                 {
                                     headerFound = true;
@@ -1170,18 +1172,18 @@ namespace BDInfo
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 1:
-                                            streamState.PESHeaderFlags = 
+                                            streamState.PESHeaderFlags =
                                                 (byte)(streamState.Parse & 0xFF);
 #if DEBUG
                                             streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 0:
-                                            streamState.PESHeaderLength = 
+                                            streamState.PESHeaderLength =
                                                 (byte)(streamState.Parse & 0xFF);
 #if DEBUG
                                             streamState.PESHeader[streamState.PESHeaderIndex++] =
@@ -1211,48 +1213,48 @@ namespace BDInfo
                                     switch (streamState.PTSParse)
                                     {
                                         case 4:
-                                            streamState.PTSTemp = 
+                                            streamState.PTSTemp =
                                                 ((streamState.Parse & 0xE) << 29);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             break;
-                                        
+
                                         case 3:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFF) << 22);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 2:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFE) << 14);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 1:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFF) << 7);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 0:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFE) >> 1);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
-#endif                                        
+#endif
                                             streamState.PTS = streamState.PTSTemp;
 
                                             if (streamState.PTS > streamState.PTSLast)
@@ -1260,13 +1262,13 @@ namespace BDInfo
                                                 if (streamState.PTSLast > 0)
                                                 {
                                                     streamState.PTSTransfer = (streamState.PTS - streamState.PTSLast);
-                                                }                                                
+                                                }
                                                 streamState.PTSLast = streamState.PTS;
                                             }
 
                                             streamState.PTSDiff = streamState.PTS - streamState.DTSPrev;
 
-                                            if (streamState.PTSCount > 0 && 
+                                            if (streamState.PTSCount > 0 &&
                                                 stream.IsVideoStream)
                                             {
                                                 UpdateStreamBitrates(stream.PID, streamState.PTS, streamState.PTSDiff);
@@ -1280,7 +1282,7 @@ namespace BDInfo
                                                 }
                                                 Length = (double)(parser.PTSLast - parser.PTSFirst) / 90000;
                                             }
-                                            
+
                                             streamState.DTSPrev = streamState.PTS;
                                             streamState.PTSCount++;
                                             if (streamState.PESHeaderLength == 0)
@@ -1299,46 +1301,46 @@ namespace BDInfo
                                     switch (streamState.DTSParse)
                                     {
                                         case 9:
-                                            streamState.PTSTemp = 
+                                            streamState.PTSTemp =
                                                 ((streamState.Parse & 0xE) << 29);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 8:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFF) << 22);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 7:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFE) << 14);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             break;
-                                        
+
                                         case 6:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFF) << 7);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 5:
-                                            streamState.PTSTemp |= 
+                                            streamState.PTSTemp |=
                                                 ((streamState.Parse & 0xFE) >> 1);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             streamState.PTS = streamState.PTSTemp;
@@ -1347,48 +1349,48 @@ namespace BDInfo
                                                 streamState.PTSLast = streamState.PTS;
                                             }
                                             break;
-                                        
+
                                         case 4:
-                                            streamState.DTSTemp = 
+                                            streamState.DTSTemp =
                                                 ((streamState.Parse & 0xE) << 29);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             break;
-                                        
+
                                         case 3:
-                                            streamState.DTSTemp |= 
+                                            streamState.DTSTemp |=
                                                 ((streamState.Parse & 0xFF) << 22);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             break;
-                                        
+
                                         case 2:
-                                            streamState.DTSTemp |= 
+                                            streamState.DTSTemp |=
                                                 ((streamState.Parse & 0xFE) << 14);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             break;
-                                        
+
                                         case 1:
-                                            streamState.DTSTemp |= 
+                                            streamState.DTSTemp |=
                                                 ((streamState.Parse & 0xFF) << 7);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xFF);
 #endif
                                             break;
-                                        
+
                                         case 0:
-                                            streamState.DTSTemp |= 
+                                            streamState.DTSTemp |=
                                                 ((streamState.Parse & 0xFE) >> 1);
 #if DEBUG
-                                            streamState.PESHeader[streamState.PESHeaderIndex++] = 
+                                            streamState.PESHeader[streamState.PESHeaderIndex++] =
                                                 (byte)(streamState.Parse & 0xff);
 #endif
                                             streamState.PTSDiff = streamState.DTSTemp - streamState.DTSPrev;
@@ -1459,7 +1461,7 @@ namespace BDInfo
 
                 ulong PTSLast = 0;
                 ulong PTSDiff = 0;
-                foreach (TSStream stream in Streams.Values)
+                foreach (var stream in Streams.Values)
                 {
                     if (!stream.IsVideoStream) continue;
 
@@ -1482,8 +1484,8 @@ namespace BDInfo
         }
 
         private TSStream CreateStream(
-            ushort streamPID, 
+            ushort streamPID,
-            byte streamType, 
+            byte streamType,
             List<TSDescriptor> streamDescriptors)
         {
             TSStream stream = null;
@@ -1495,10 +1497,10 @@ namespace BDInfo
                 case TSStreamType.MPEG1_VIDEO:
                 case TSStreamType.MPEG2_VIDEO:
                 case TSStreamType.VC1_VIDEO:
-                {
+                    {
-                    stream = new TSVideoStream();
+                        stream = new TSVideoStream();
-                }
+                    }
-                break;
+                    break;
 
                 case TSStreamType.AC3_AUDIO:
                 case TSStreamType.AC3_PLUS_AUDIO:
@@ -1511,23 +1513,23 @@ namespace BDInfo
                 case TSStreamType.LPCM_AUDIO:
                 case TSStreamType.MPEG1_AUDIO:
                 case TSStreamType.MPEG2_AUDIO:
-                {
+                    {
-                    stream = new TSAudioStream();
+                        stream = new TSAudioStream();
-                }
+                    }
-                break;
+                    break;
 
                 case TSStreamType.INTERACTIVE_GRAPHICS:
                 case TSStreamType.PRESENTATION_GRAPHICS:
-                {
+                    {
-                    stream = new TSGraphicsStream();
+                        stream = new TSGraphicsStream();
-                }
+                    }
-                break;
+                    break;
 
                 case TSStreamType.SUBTITLE:
-                {
+                    {
-                    stream = new TSTextStream();
+                        stream = new TSTextStream();
-                }
+                    }
-                break;
+                    break;
 
                 default:
                     break;
@@ -1548,6 +1550,6 @@ namespace BDInfo
             }
 
             return stream;
-        } 
+        }
     }
 }

CONTRIBUTORS.md

@@ -11,6 +11,14 @@
  - [AnthonyLavado](https://github.com/anthonylavado)
  - [sparky8251](https://github.com/sparky8251)
  - [LeoVerto](https://github.com/LeoVerto)
+ - [grafixeyehero](https://github.com/grafixeyehero)
+ - [cvium](https://github.com/cvium)
+ - [wtayl0r](https://github.com/wtayl0r)
+ - [TtheCreator](https://github.com/Tthecreator)
+ - [dkanada](https://github.com/dkanada)
+ - [LogicalPhallacy](https://github.com/LogicalPhallacy/)
+ - [RazeLighter777](https://github.com/RazeLighter777)
+ - [WillWill56](https://github.com/WillWill56)
 
 # Emby Contributors
 

Dockerfile

@@ -1,28 +1,29 @@
 ARG DOTNET_VERSION=2
 
-
-# Download ffmpeg first to allow quicker rebuild of other layers
-FROM alpine as ffmpeg
-ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz
-RUN wget ${FFMPEG_URL} -O - | tar Jxf - \
- && mkdir ffmpeg-bin \
- && mv ffmpeg*/ffmpeg ffmpeg-bin \
- && mv ffmpeg*/ffprobe ffmpeg-bin
-
-
 FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
 WORKDIR /repo
 COPY . .
-RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
- && dotnet clean \
+RUN bash -c "source deployment/common.build.sh && \
- && dotnet publish --configuration release --output /jellyfin
+    build_jellyfin Jellyfin.Server Release linux-x64 /jellyfin"
-
 
+FROM jellyfin/ffmpeg as ffmpeg
 FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
+# libfontconfig1 is required for Skia
+RUN apt-get update \
+ && apt-get install --no-install-recommends --no-install-suggests -y \
+   libfontconfig1 \
+ && apt-get clean autoclean \
+ && apt-get autoremove \
+ && rm -rf /var/lib/{apt,dpkg,cache,log} \
+ && mkdir -p /cache /config /media \
+ && chmod 777 /cache /config /media
+COPY --from=ffmpeg / /
 COPY --from=builder /jellyfin /jellyfin
-COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/
 EXPOSE 8096
-VOLUME /config /media
+VOLUME /cache /config /media
-RUN apt update \
+ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
- && apt install -y libfontconfig1  # needed for Skia
+    --datadir /config \
-ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config
+    --cachedir /cache \
+    --ffmpeg /usr/local/bin/ffmpeg \
+    --ffprobe /usr/local/bin/ffprobe

Dockerfile.aarch64

@@ -1,17 +0,0 @@
-ARG DOTNET_VERSION=3.0
-
-FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
-WORKDIR /repo
-COPY . .
-RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
- && find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \; \
- && dotnet clean \
- && dotnet publish --configuration release --output /jellyfin
-
-FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
-COPY --from=builder /jellyfin /jellyfin
-EXPOSE 8096
-RUN apt update \
- && apt install -y ffmpeg
-VOLUME /config /media
-ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config

Dockerfile.arm

@@ -0,0 +1,37 @@
+# Requires binfm_misc registration
+# https://github.com/multiarch/qemu-user-static#binfmt_misc-register
+ARG DOTNET_VERSION=3.0
+
+
+FROM multiarch/qemu-user-static:x86_64-arm as qemu
+FROM alpine as qemu_extract
+COPY --from=qemu /usr/bin qemu-arm-static.tar.gz
+RUN tar -xzvf qemu-arm-static.tar.gz
+
+FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch as builder
+WORKDIR /repo
+COPY . .
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+# TODO Remove or update the sed line when we update dotnet version.
+RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
+# Discard objs - may cause failures if exists
+RUN find . -type d -name obj | xargs -r rm -r
+# Build
+RUN bash -c "source deployment/common.build.sh && \
+    build_jellyfin Jellyfin.Server Release linux-arm /jellyfin"
+
+
+FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm32v7
+COPY --from=qemu_extract qemu-arm-static /usr/bin
+RUN apt-get update \
+ && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \
+ && mkdir -p /cache /config /media \
+ && chmod 777 /cache /config /media
+COPY --from=builder /jellyfin /jellyfin
+EXPOSE 8096
+VOLUME /cache /config /media
+ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
+    --datadir /config \
+    --cachedir /cache \
+    --ffmpeg /usr/bin/ffmpeg \
+    --ffprobe /usr/bin/ffprobe

Dockerfile.arm64

@@ -0,0 +1,38 @@
+# Requires binfm_misc registration
+# https://github.com/multiarch/qemu-user-static#binfmt_misc-register
+ARG DOTNET_VERSION=3.0
+
+
+FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
+FROM alpine as qemu_extract
+COPY --from=qemu /usr/bin qemu-aarch64-static.tar.gz
+RUN tar -xzvf qemu-aarch64-static.tar.gz
+
+
+FROM microsoft/dotnet:${DOTNET_VERSION}-sdk-stretch as builder
+WORKDIR /repo
+COPY . .
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+# TODO Remove or update the sed line when we update dotnet version.
+RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
+# Discard objs - may cause failures if exists
+RUN find . -type d -name obj | xargs -r rm -r
+# Build
+RUN bash -c "source deployment/common.build.sh && \
+    build_jellyfin Jellyfin.Server Release linux-arm64 /jellyfin"
+
+
+FROM microsoft/dotnet:${DOTNET_VERSION}-runtime-stretch-slim-arm64v8
+COPY --from=qemu_extract qemu-aarch64-static /usr/bin
+RUN apt-get update \
+ && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \
+ && mkdir -p /cache /config /media \
+ && chmod 777 /cache /config /media
+COPY --from=builder /jellyfin /jellyfin
+EXPOSE 8096
+VOLUME /cache /config /media
+ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
+    --datadir /config \
+    --cachedir /cache \
+    --ffmpeg /usr/bin/ffmpeg \
+    --ffprobe /usr/bin/ffprobe

Dockerfile.debian_package

@@ -1,22 +0,0 @@
-FROM debian:9
-
-# https://dotnet.microsoft.com/download/linux-package-manager/debian9/sdk-current
-RUN apt-get update \
- && apt-get install -y apt-transport-https debhelper gnupg wget devscripts \
- && wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.asc.gpg \
- && mv microsoft.asc.gpg /etc/apt/trusted.gpg.d/ \
- && wget -q https://packages.microsoft.com/config/debian/9/prod.list \
- && mv prod.list /etc/apt/sources.list.d/microsoft-prod.list \
- && chown root:root /etc/apt/trusted.gpg.d/microsoft.asc.gpg \
- && chown root:root /etc/apt/sources.list.d/microsoft-prod.list \
- && apt-get update
-
-WORKDIR /repo
-COPY . .
-
-RUN yes|mk-build-deps -i \
- && dpkg-buildpackage -us -uc \
- && mkdir /dist \
- && mv /jellyfin*deb /dist
-
-WORKDIR /dist

DvdLib/BigEndianBinaryReader.cs

@@ -1,7 +1,4 @@
-using System;
+using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace DvdLib

DvdLib/DvdLib.csproj

@@ -1,4 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />

DvdLib/Ifo/AudioAttributes.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace DvdLib.Ifo
 {
     public enum AudioCodec

DvdLib/Ifo/Cell.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace DvdLib.Ifo

DvdLib/Ifo/CellPlaybackInfo.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace DvdLib.Ifo

DvdLib/Ifo/CellPositionInfo.cs

@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace DvdLib.Ifo

DvdLib/Ifo/Chapter.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace DvdLib.Ifo
 {
     public class Chapter

DvdLib/Ifo/Dvd.cs

@@ -1,9 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-using System.Diagnostics;
+using System.Linq;
 using MediaBrowser.Model.IO;
 
 namespace DvdLib.Ifo
@@ -33,10 +31,9 @@ namespace DvdLib.Ifo
                 foreach (var ifo in allIfos)
                 {
                     var num = ifo.Name.Split('_').ElementAtOrDefault(1);
-                    ushort ifoNumber;
                     var numbersRead = new List<ushort>();
 
-                    if (!string.IsNullOrEmpty(num) && ushort.TryParse(num, out ifoNumber) && !numbersRead.Contains(ifoNumber))
+                    if (!string.IsNullOrEmpty(num) && ushort.TryParse(num, out var ifoNumber) && !numbersRead.Contains(ifoNumber))
                     {
                         ReadVTS(ifoNumber, ifo.FullName);
                         numbersRead.Add(ifoNumber);
@@ -47,7 +44,7 @@ namespace DvdLib.Ifo
             {
                 using (var vmgFs = _fileSystem.GetFileStream(vmgPath.FullName, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
                 {
-                    using (BigEndianBinaryReader vmgRead = new BigEndianBinaryReader(vmgFs))
+                    using (var vmgRead = new BigEndianBinaryReader(vmgFs))
                     {
                         vmgFs.Seek(0x3E, SeekOrigin.Begin);
                         _titleSetCount = vmgRead.ReadUInt16();
@@ -73,7 +70,7 @@ namespace DvdLib.Ifo
             read.BaseStream.Seek(6, SeekOrigin.Current);
             for (uint titleNum = 1; titleNum <= _titleCount; titleNum++)
             {
-                Title t = new Title(titleNum);
+                var t = new Title(titleNum);
                 t.ParseTT_SRPT(read);
                 Titles.Add(t);
             }
@@ -81,7 +78,7 @@ namespace DvdLib.Ifo
 
         private void ReadVTS(ushort vtsNum, List<FileSystemMetadata> allFiles)
         {
-            var filename = String.Format("VTS_{0:00}_0.IFO", vtsNum);
+            var filename = string.Format("VTS_{0:00}_0.IFO", vtsNum);
 
             var vtsPath = allFiles.FirstOrDefault(i => string.Equals(i.Name, filename, StringComparison.OrdinalIgnoreCase)) ??
                 allFiles.FirstOrDefault(i => string.Equals(i.Name, Path.ChangeExtension(filename, ".bup"), StringComparison.OrdinalIgnoreCase));
@@ -100,7 +97,7 @@ namespace DvdLib.Ifo
 
             using (var vtsFs = _fileSystem.GetFileStream(vtsPath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
             {
-                using (BigEndianBinaryReader vtsRead = new BigEndianBinaryReader(vtsFs))
+                using (var vtsRead = new BigEndianBinaryReader(vtsFs))
                 {
                     // Read VTS_PTT_SRPT
                     vtsFs.Seek(0xC8, SeekOrigin.Begin);
@@ -121,7 +118,7 @@ namespace DvdLib.Ifo
                     {
                         uint chapNum = 1;
                         vtsFs.Seek(baseAddr + offsets[titleNum], SeekOrigin.Begin);
-                        Title t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum + 1));
+                        var t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum + 1));
                         if (t == null) continue;
 
                         do
@@ -151,11 +148,11 @@ namespace DvdLib.Ifo
                         vtsFs.Seek(3, SeekOrigin.Current);
                         uint vtsPgcOffset = vtsRead.ReadUInt32();
 
-                        Title t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum));
+                        var t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum));
                         if (t != null) t.AddPgc(vtsRead, startByte + vtsPgcOffset, entryPgc, pgcNum);
                     }
                 }
             }
         }
     }
-}
+}

DvdLib/Ifo/DvdTime.cs

@@ -1,7 +1,4 @@
-using System;
+using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace DvdLib.Ifo
 {
@@ -20,7 +17,7 @@ namespace DvdLib.Ifo
             else if ((data[3] & 0x40) != 0) FrameRate = 25;
         }
 
-        private byte GetBCDValue(byte data)
+        private static byte GetBCDValue(byte data)
         {
             return (byte)((((data & 0xF0) >> 4) * 10) + (data & 0x0F));
         }

DvdLib/Ifo/PgcCommandTable.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace DvdLib.Ifo
 {

DvdLib/Ifo/Program.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace DvdLib.Ifo
 {

DvdLib/Ifo/ProgramChain.cs

@@ -1,8 +1,6 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
+using System.Linq;
 
 namespace DvdLib.Ifo
 {
@@ -68,7 +66,7 @@ namespace DvdLib.Ifo
             ProhibitedUserOperations = (UserOperation)br.ReadUInt32();
             AudioStreamControl = br.ReadBytes(16);
             SubpictureStreamControl = br.ReadBytes(128);
-            
+
             _nextProgramNumber = br.ReadUInt16();
             _prevProgramNumber = br.ReadUInt16();
             _goupProgramNumber = br.ReadUInt16();
@@ -89,7 +87,7 @@ namespace DvdLib.Ifo
             br.BaseStream.Seek(startPos + _cellPositionOffset, SeekOrigin.Begin);
             for (int cellNum = 0; cellNum < _cellCount; cellNum++)
             {
-                Cell c = new Cell();
+                var c = new Cell();
                 c.ParsePosition(br);
                 Cells.Add(c);
             }
@@ -101,12 +99,12 @@ namespace DvdLib.Ifo
             }
 
             br.BaseStream.Seek(startPos + _programMapOffset, SeekOrigin.Begin);
-            List<int> cellNumbers = new List<int>();
+            var cellNumbers = new List<int>();
             for (int progNum = 0; progNum < _programCount; progNum++) cellNumbers.Add(br.ReadByte() - 1);
 
             for (int i = 0; i < cellNumbers.Count; i++)
             {
-                int max = (i + 1 == cellNumbers.Count) ? _cellCount : cellNumbers[i+1];
+                int max = (i + 1 == cellNumbers.Count) ? _cellCount : cellNumbers[i + 1];
                 Programs.Add(new Program(Cells.Where((c, idx) => idx >= cellNumbers[i] && idx < max).ToList()));
             }
         }

DvdLib/Ifo/Title.cs

@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
 
 namespace DvdLib.Ifo
@@ -20,7 +17,7 @@ namespace DvdLib.Ifo
         public ProgramChain EntryProgramChain { get; private set; }
         public readonly List<ProgramChain> ProgramChains;
 
-        public readonly List<Chapter> Chapters;        
+        public readonly List<Chapter> Chapters;
 
         public Title(uint titleNum)
         {
@@ -53,7 +50,7 @@ namespace DvdLib.Ifo
             long curPos = br.BaseStream.Position;
             br.BaseStream.Seek(startByte, SeekOrigin.Begin);
 
-            ProgramChain pgc = new ProgramChain(pgcNum);
+            var pgc = new ProgramChain(pgcNum);
             pgc.ParseHeader(br);
             ProgramChains.Add(pgc);
             if (entryPgc) EntryProgramChain = pgc;

DvdLib/Ifo/UserOperation.cs

@@ -1,7 +1,4 @@
-using System;
+using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace DvdLib.Ifo
 {

DvdLib/Ifo/VideoAttributes.cs

@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace DvdLib.Ifo
 {
     public enum VideoCodec

DvdLib/Properties/AssemblyInfo.cs

@@ -1,29 +1,21 @@
-using System.Resources;
 using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Resources;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("DvdLib")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Jellyfin Project")]
-[assembly: AssemblyProduct("DvdLib")]
+[assembly: AssemblyProduct("Jellyfin: The Free Software Media System")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License Version 2")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguage("en")]
 
-// Version information for an assembly consists of the following four values:
+// Setting ComVisible to false makes the types in this assembly not visible
-//
+// to COM components.  If you need to access a type in this assembly from
-//      Major Version
+// COM, set the ComVisible attribute to true on that type.
-//      Minor Version 
+[assembly: ComVisible(false)]
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1")]

Emby.Dlna/Api/DlnaServerService.cs

@@ -1,14 +1,14 @@
-using MediaBrowser.Controller.Dlna;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
-using MediaBrowser.Common.Extensions;
-using System.Text;
-using MediaBrowser.Controller.Net;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using Emby.Dlna.Main;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Services;
 
 namespace Emby.Dlna.Api
 {
@@ -115,29 +115,11 @@ namespace Emby.Dlna.Api
         public IRequest Request { get; set; }
         private IHttpResultFactory _resultFactory;
 
-        private IContentDirectory ContentDirectory
+        private IContentDirectory ContentDirectory => DlnaEntryPoint.Current.ContentDirectory;
-        {
-            get
-            {
-                return DlnaEntryPoint.Current.ContentDirectory;
-            }
-        }
 
-        private IConnectionManager ConnectionManager
+        private IConnectionManager ConnectionManager => DlnaEntryPoint.Current.ConnectionManager;
-        {
-            get
-            {
-                return DlnaEntryPoint.Current.ConnectionManager;
-            }
-        }
 
-        private IMediaReceiverRegistrar MediaReceiverRegistrar
+        private IMediaReceiverRegistrar MediaReceiverRegistrar => DlnaEntryPoint.Current.MediaReceiverRegistrar;
-        {
-            get
-            {
-                return DlnaEntryPoint.Current.MediaReceiverRegistrar;
-            }
-        }
 
         public DlnaServerService(IDlnaManager dlnaManager, IHttpResultFactory httpResultFactory)
         {
@@ -227,7 +209,7 @@ namespace Emby.Dlna.Api
             // TODO: Work out what this is doing.
             if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase ))
+                string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase))
             {
                 index++;
             }
@@ -254,12 +236,14 @@ namespace Emby.Dlna.Api
 
         public object Get(GetIcon request)
         {
-            var contentType = "image/" + Path.GetExtension(request.Filename).TrimStart('.').ToLower();
+            var contentType = "image/" + Path.GetExtension(request.Filename)
+                                            .TrimStart('.')
+                                            .ToLowerInvariant();
 
             var cacheLength = TimeSpan.FromDays(365);
             var cacheKey = Request.RawUrl.GetMD5();
 
-            return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, contentType, () => Task.FromResult<Stream>(_dlnaManager.GetIcon(request.Filename).Stream));
+            return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, contentType, () => Task.FromResult(_dlnaManager.GetIcon(request.Filename).Stream));
         }
 
         public object Subscribe(ProcessContentDirectoryEventRequest request)

Emby.Dlna/Api/DlnaService.cs

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Dlna;
@@ -80,4 +80,4 @@ namespace Emby.Dlna.Api
             _dlnaManager.CreateProfile(request);
         }
     }
-}
+}

Emby.Dlna/Common/Argument.cs

@@ -1,12 +1,12 @@
-
+
 namespace Emby.Dlna.Common
-{  
+{
     public class Argument
     {
-        public string Name { get;  set; }
+        public string Name { get; set; }
 
-        public string Direction { get;  set; }
+        public string Direction { get; set; }
 
-        public string RelatedStateVariable { get;  set; }
+        public string RelatedStateVariable { get; set; }
     }
 }

Emby.Dlna/Common/DeviceIcon.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Common
 {
     public class DeviceIcon

Emby.Dlna/Common/DeviceService.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Common
 {
     public class DeviceService

Emby.Dlna/Common/ServiceAction.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna.Common
 {

Emby.Dlna/Common/StateVariable.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System;
 
 namespace Emby.Dlna.Common

Emby.Dlna/Configuration/DlnaOptions.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna.Configuration
 {
     public class DlnaOptions

Emby.Dlna/ConfigurationExtension.cs

@@ -1,6 +1,6 @@
-using MediaBrowser.Common.Configuration;
-using Emby.Dlna.Configuration;
 using System.Collections.Generic;
+using Emby.Dlna.Configuration;
+using MediaBrowser.Common.Configuration;
 
 namespace Emby.Dlna
 {

Emby.Dlna/ConnectionManager/ConnectionManager.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Common.Net;
+using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
-using Emby.Dlna.Service;
-using System.Collections.Generic;
 using MediaBrowser.Model.Xml;
 using Microsoft.Extensions.Logging;
 

Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs

@@ -1,6 +1,6 @@
-using Emby.Dlna.Common;
-using Emby.Dlna.Service;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
+using Emby.Dlna.Service;
 
 namespace Emby.Dlna.ConnectionManager
 {
@@ -11,7 +11,7 @@ namespace Emby.Dlna.ConnectionManager
             return new ServiceXmlBuilder().GetXml(new ServiceActionListBuilder().GetActions(), GetStateVariables());
         }
 
-        private IEnumerable<StateVariable> GetStateVariables()
+        private static IEnumerable<StateVariable> GetStateVariables()
         {
             var list = new List<StateVariable>();
 

Emby.Dlna/ConnectionManager/ControlHandler.cs

@@ -1,12 +1,11 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Server;
-using Emby.Dlna.Service;
-using MediaBrowser.Model.Dlna;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.ConnectionManager
 {

Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs

@@ -1,5 +1,5 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
 
 namespace Emby.Dlna.ConnectionManager
 {
@@ -19,7 +19,7 @@ namespace Emby.Dlna.ConnectionManager
             return list;
         }
 
-        private ServiceAction PrepareForConnection()
+        private static ServiceAction PrepareForConnection()
         {
             var action = new ServiceAction
             {
@@ -77,8 +77,8 @@ namespace Emby.Dlna.ConnectionManager
 
             return action;
         }
-        
+
-        private ServiceAction GetCurrentConnectionInfo()
+        private static ServiceAction GetCurrentConnectionInfo()
         {
             var action = new ServiceAction
             {

Emby.Dlna/ContentDirectory/ContentDirectory.cs

@@ -1,18 +1,18 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using Emby.Dlna.Service;
-using MediaBrowser.Model.Dlna;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.TV;
+using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -76,7 +76,6 @@ namespace Emby.Dlna.ContentDirectory
                           _dlna.GetDefaultProfile();
 
             var serverAddress = request.RequestedUrl.Substring(0, request.RequestedUrl.IndexOf("/dlna", StringComparison.OrdinalIgnoreCase));
-            string accessToken = null;
 
             var user = GetUser(profile);
 
@@ -85,7 +84,7 @@ namespace Emby.Dlna.ContentDirectory
                 _libraryManager,
                 profile,
                 serverAddress,
-                accessToken,
+                null,
                 _imageProcessor,
                 _userDataManager,
                 user,

Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs

@@ -1,6 +1,6 @@
-using Emby.Dlna.Common;
-using Emby.Dlna.Service;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
+using Emby.Dlna.Service;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -8,11 +8,11 @@ namespace Emby.Dlna.ContentDirectory
     {
         public string GetXml()
         {
-            return new ServiceXmlBuilder().GetXml(new ServiceActionListBuilder().GetActions(), 
+            return new ServiceXmlBuilder().GetXml(new ServiceActionListBuilder().GetActions(),
                 GetStateVariables());
         }
 
-        private IEnumerable<StateVariable> GetStateVariables()
+        private static IEnumerable<StateVariable> GetStateVariables()
         {
             var list = new List<StateVariable>();
 

Emby.Dlna/ContentDirectory/ControlHandler.cs

@@ -1,19 +1,3 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Channels;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using Emby.Dlna.Didl;
-using Emby.Dlna.Server;
-using Emby.Dlna.Service;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Querying;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -21,17 +5,28 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Xml;
+using Emby.Dlna.Didl;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.TV;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Xml;
-using MediaBrowser.Model.Extensions;
+using Microsoft.Extensions.Logging;
-using MediaBrowser.Controller.LiveTv;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -68,7 +63,7 @@ namespace Emby.Dlna.ContentDirectory
             _profile = profile;
             _config = config;
 
-            _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, accessToken, userDataManager, localization, mediaSourceManager, _logger, libraryManager, mediaEncoder);
+            _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, accessToken, userDataManager, localization, mediaSourceManager, _logger, mediaEncoder);
         }
 
         protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
@@ -197,9 +192,7 @@ namespace Emby.Dlna.ContentDirectory
 
         public string GetValueOrDefault(IDictionary<string, string> sparams, string key, string defaultValue)
         {
-            string val;
+            if (sparams.TryGetValue(key, out string val))
-
-            if (sparams.TryGetValue(key, out val))
             {
                 return val;
             }
@@ -221,14 +214,12 @@ namespace Emby.Dlna.ContentDirectory
             int? requestedCount = null;
             int? start = 0;
 
-            int requestedVal;
+            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out var requestedVal) && requestedVal > 0)
-            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
             {
                 requestedCount = requestedVal;
             }
 
-            int startVal;
+            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out var startVal) && startVal > 0)
-            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out startVal) && startVal > 0)
             {
                 start = startVal;
             }
@@ -247,7 +238,7 @@ namespace Emby.Dlna.ContentDirectory
 
             var dlnaOptions = _config.GetDlnaConfiguration();
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 //writer.WriteStartDocument();
 
@@ -311,7 +302,7 @@ namespace Emby.Dlna.ContentDirectory
 
             var resXML = builder.ToString();
 
-            return new []
+            return new[]
                 {
                     new KeyValuePair<string,string>("Result", resXML),
                     new KeyValuePair<string,string>("NumberReturned", provided.ToString(_usCulture)),
@@ -339,14 +330,12 @@ namespace Emby.Dlna.ContentDirectory
             int? requestedCount = null;
             int? start = 0;
 
-            int requestedVal;
+            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out var requestedVal) && requestedVal > 0)
-            if (sparams.ContainsKey("RequestedCount") && int.TryParse(sparams["RequestedCount"], out requestedVal) && requestedVal > 0)
             {
                 requestedCount = requestedVal;
             }
 
-            int startVal;
+            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out var startVal) && startVal > 0)
-            if (sparams.ContainsKey("StartingIndex") && int.TryParse(sparams["StartingIndex"], out startVal) && startVal > 0)
             {
                 start = startVal;
             }
@@ -363,7 +352,7 @@ namespace Emby.Dlna.ContentDirectory
             int totalCount = 0;
             int provided = 0;
 
-            using (XmlWriter writer = XmlWriter.Create(builder, settings))
+            using (var writer = XmlWriter.Create(builder, settings))
             {
                 //writer.WriteStartDocument();
 
@@ -465,7 +454,7 @@ namespace Emby.Dlna.ContentDirectory
                 User = user,
                 Recursive = true,
                 IsMissing = false,
-                ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name },
+                ExcludeItemTypes = new[] { typeof(Book).Name },
                 IsFolder = isFolder,
                 MediaTypes = mediaTypes.ToArray(),
                 DtoOptions = GetDtoOptions()
@@ -494,27 +483,26 @@ namespace Emby.Dlna.ContentDirectory
                 return GetGenreItems(item, Guid.Empty, user, sort, startIndex, limit);
             }
 
-            if (!stubType.HasValue || stubType.Value != StubType.Folder)
+            if ((!stubType.HasValue || stubType.Value != StubType.Folder)
+                && item is IHasCollectionType collectionFolder)
             {
-                var collectionFolder = item as IHasCollectionType;
+                if (string.Equals(CollectionType.Music, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
-                if (collectionFolder != null && string.Equals(CollectionType.Music, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetMusicFolders(item, user, stubType, sort, startIndex, limit);
                 }
-                if (collectionFolder != null && string.Equals(CollectionType.Movies, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(CollectionType.Movies, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetMovieFolders(item, user, stubType, sort, startIndex, limit);
                 }
-                if (collectionFolder != null && string.Equals(CollectionType.TvShows, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(CollectionType.TvShows, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetTvFolders(item, user, stubType, sort, startIndex, limit);
                 }
-
+                else if (string.Equals(CollectionType.Folders, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
-                if (collectionFolder != null && string.Equals(CollectionType.Folders, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetFolders(item, user, stubType, sort, startIndex, limit);
                 }
-                if (collectionFolder != null && string.Equals(CollectionType.LiveTv, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
+                else if (string.Equals(CollectionType.LiveTv, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetLiveTvChannels(item, user, stubType, sort, startIndex, limit);
                 }
@@ -535,7 +523,7 @@ namespace Emby.Dlna.ContentDirectory
                 Limit = limit,
                 StartIndex = startIndex,
                 IsVirtualItem = false,
-                ExcludeItemTypes = new[] { typeof(Game).Name, typeof(Book).Name },
+                ExcludeItemTypes = new[] { typeof(Book).Name },
                 IsPlaceHolder = false,
                 DtoOptions = GetDtoOptions()
             };
@@ -1144,7 +1132,7 @@ namespace Emby.Dlna.ContentDirectory
                 StartIndex = query.StartIndex,
                 UserId = query.User.Id
 
-            }, new [] { parent }, query.DtoOptions);
+            }, new[] { parent }, query.DtoOptions);
 
             return ToResult(result);
         }
@@ -1298,7 +1286,6 @@ namespace Emby.Dlna.ContentDirectory
 
         private ServerItem ParseItemId(string id, User user)
         {
-            Guid itemId;
             StubType? stubType = null;
 
             // After using PlayTo, MediaMonkey sends a request to the server trying to get item info
@@ -1324,7 +1311,7 @@ namespace Emby.Dlna.ContentDirectory
                 }
             }
 
-            if (Guid.TryParse(id, out itemId))
+            if (Guid.TryParse(id, out var itemId))
             {
                 var item = _libraryManager.GetItemById(itemId);
 

Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs

@@ -1,5 +1,5 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -7,7 +7,7 @@ namespace Emby.Dlna.ContentDirectory
     {
         public IEnumerable<ServiceAction> GetActions()
         {
-            return new []
+            return new[]
             {
                 GetSearchCapabilitiesAction(),
                 GetSortCapabilitiesAction(),
@@ -20,7 +20,7 @@ namespace Emby.Dlna.ContentDirectory
             };
         }
 
-        private ServiceAction GetGetSystemUpdateIDAction()
+        private static ServiceAction GetGetSystemUpdateIDAction()
         {
             var action = new ServiceAction
             {
@@ -37,7 +37,7 @@ namespace Emby.Dlna.ContentDirectory
             return action;
         }
 
-        private ServiceAction GetSearchCapabilitiesAction()
+        private static ServiceAction GetSearchCapabilitiesAction()
         {
             var action = new ServiceAction
             {
@@ -54,7 +54,7 @@ namespace Emby.Dlna.ContentDirectory
             return action;
         }
 
-        private ServiceAction GetSortCapabilitiesAction()
+        private static ServiceAction GetSortCapabilitiesAction()
         {
             var action = new ServiceAction
             {
@@ -71,7 +71,7 @@ namespace Emby.Dlna.ContentDirectory
             return action;
         }
 
-        private ServiceAction GetX_GetFeatureListAction()
+        private static ServiceAction GetX_GetFeatureListAction()
         {
             var action = new ServiceAction
             {
@@ -88,7 +88,7 @@ namespace Emby.Dlna.ContentDirectory
             return action;
         }
 
-        private ServiceAction GetSearchAction()
+        private static ServiceAction GetSearchAction()
         {
             var action = new ServiceAction
             {
@@ -334,7 +334,7 @@ namespace Emby.Dlna.ContentDirectory
 
             return action;
         }
-        
+
         private ServiceAction GetXSetBookmarkAction()
         {
             var action = new ServiceAction

Emby.Dlna/ControlRequest.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Emby.Dlna

Emby.Dlna/ControlResponse.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
@@ -15,4 +15,4 @@ namespace Emby.Dlna
             Headers = new Dictionary<string, string>();
         }
     }
-}
+}

Emby.Dlna/Didl/DidlBuilder.cs

@@ -1,4 +1,11 @@
-using MediaBrowser.Model.Extensions;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using Emby.Dlna.Configuration;
+using Emby.Dlna.ContentDirectory;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
@@ -6,23 +13,15 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Playlists;
-using Emby.Dlna.ContentDirectory;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
+using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.Net;
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using MediaBrowser.Controller.MediaEncoding;
-using Emby.Dlna.Configuration;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Net;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Didl
 {
@@ -44,22 +43,30 @@ namespace Emby.Dlna.Didl
         private readonly ILocalizationManager _localization;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly ILogger _logger;
-        private readonly ILibraryManager _libraryManager;
         private readonly IMediaEncoder _mediaEncoder;
 
-        public DidlBuilder(DeviceProfile profile, User user, IImageProcessor imageProcessor, string serverAddress, string accessToken, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, ILogger logger, ILibraryManager libraryManager, IMediaEncoder mediaEncoder)
+        public DidlBuilder(
+            DeviceProfile profile,
+            User user,
+            IImageProcessor imageProcessor,
+            string serverAddress,
+            string accessToken,
+            IUserDataManager userDataManager,
+            ILocalizationManager localization,
+            IMediaSourceManager mediaSourceManager,
+            ILogger logger,
+            IMediaEncoder mediaEncoder)
         {
             _profile = profile;
+            _user = user;
             _imageProcessor = imageProcessor;
             _serverAddress = serverAddress;
+            _accessToken = accessToken;
             _userDataManager = userDataManager;
             _localization = localization;
             _mediaSourceManager = mediaSourceManager;
             _logger = logger;
-            _libraryManager = libraryManager;
             _mediaEncoder = mediaEncoder;
-            _accessToken = accessToken;
-            _user = user;
         }
 
         public static string NormalizeDlnaMediaUrl(string url)
@@ -79,7 +86,7 @@ namespace Emby.Dlna.Didl
 
             using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
             {
-                using (XmlWriter writer = XmlWriter.Create(builder, settings))
+                using (var writer = XmlWriter.Create(builder, settings))
                 {
                     //writer.WriteStartDocument();
 
@@ -118,7 +125,8 @@ namespace Emby.Dlna.Didl
             }
         }
 
-        public void WriteItemElement(DlnaOptions options,
+        public void WriteItemElement(
+            DlnaOptions options,
             XmlWriter writer,
             BaseItem item,
             User user,
@@ -233,12 +241,15 @@ namespace Emby.Dlna.Didl
                 AddVideoResource(writer, video, deviceId, filter, contentFeature, streamInfo);
             }
 
-            var subtitleProfiles = streamInfo.GetSubtitleProfiles(_mediaEncoder, false, _serverAddress, _accessToken)
+            var subtitleProfiles = streamInfo.GetSubtitleProfiles(_mediaEncoder, false, _serverAddress, _accessToken);
-                .Where(subtitle => subtitle.DeliveryMethod == SubtitleDeliveryMethod.External)
-                .ToList();
 
             foreach (var subtitle in subtitleProfiles)
             {
+                if (subtitle.DeliveryMethod != SubtitleDeliveryMethod.External)
+                {
+                    continue;
+                }
+
                 var subtitleAdded = AddSubtitleElement(writer, subtitle);
 
                 if (subtitleAdded && _profile.EnableSingleSubtitleLimit)
@@ -251,7 +262,8 @@ namespace Emby.Dlna.Didl
         private bool AddSubtitleElement(XmlWriter writer, SubtitleStreamInfo info)
         {
             var subtitleProfile = _profile.SubtitleProfiles
-                .FirstOrDefault(i => string.Equals(info.Format, i.Format, StringComparison.OrdinalIgnoreCase) && i.Method == SubtitleDeliveryMethod.External);
+                .FirstOrDefault(i => string.Equals(info.Format, i.Format, StringComparison.OrdinalIgnoreCase)
+                                    && i.Method == SubtitleDeliveryMethod.External);
 
             if (subtitleProfile == null)
             {
@@ -266,7 +278,7 @@ namespace Emby.Dlna.Didl
                 // <sec:CaptionInfo sec:type="srt">http://192.168.1.3:9999/video.srt</sec:CaptionInfo>
 
                 writer.WriteStartElement("sec", "CaptionInfoEx", null);
-                writer.WriteAttributeString("sec", "type", null, info.Format.ToLower());
+                writer.WriteAttributeString("sec", "type", null, info.Format.ToLowerInvariant());
 
                 writer.WriteString(info.Url);
                 writer.WriteFullEndElement();
@@ -283,7 +295,7 @@ namespace Emby.Dlna.Didl
             else
             {
                 writer.WriteStartElement(string.Empty, "res", NS_DIDL);
-                var protocolInfo = string.Format("http-get:*:text/{0}:*", info.Format.ToLower());
+                var protocolInfo = string.Format("http-get:*:text/{0}:*", info.Format.ToLowerInvariant());
                 writer.WriteAttributeString("protocolInfo", protocolInfo);
 
                 writer.WriteString(info.Url);
@@ -375,7 +387,7 @@ namespace Emby.Dlna.Didl
                ? GetMimeType(filename)
                : mediaProfile.MimeType;
 
-            writer.WriteAttributeString("protocolInfo", String.Format(
+            writer.WriteAttributeString("protocolInfo", string.Format(
                 "http-get:*:{0}:{1}",
                 mimeType,
                 contentFeatures
@@ -388,91 +400,39 @@ namespace Emby.Dlna.Didl
 
         private string GetDisplayName(BaseItem item, StubType? itemStubType, BaseItem context)
         {
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Latest)
+            if (itemStubType.HasValue)
             {
-                return _localization.GetLocalizedString("Latest");
+                switch (itemStubType.Value)
-            }
+                {
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Playlists)
+                    case StubType.Latest:           return _localization.GetLocalizedString("Latest");
-            {
+                    case StubType.Playlists:        return _localization.GetLocalizedString("Playlists");
-                return _localization.GetLocalizedString("Playlists");
+                    case StubType.AlbumArtists:     return _localization.GetLocalizedString("HeaderAlbumArtists");
-            }
+                    case StubType.Albums:           return _localization.GetLocalizedString("Albums");
-            if (itemStubType.HasValue && itemStubType.Value == StubType.AlbumArtists)
+                    case StubType.Artists:          return _localization.GetLocalizedString("Artists");
-            {
+                    case StubType.Songs:            return _localization.GetLocalizedString("Songs");
-                return _localization.GetLocalizedString("HeaderAlbumArtists");
+                    case StubType.Genres:           return _localization.GetLocalizedString("Genres");
-            }
+                    case StubType.FavoriteAlbums:   return _localization.GetLocalizedString("HeaderFavoriteAlbums");
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Albums)
+                    case StubType.FavoriteArtists:  return _localization.GetLocalizedString("HeaderFavoriteArtists");
-            {
+                    case StubType.FavoriteSongs:    return _localization.GetLocalizedString("HeaderFavoriteSongs");
-                return _localization.GetLocalizedString("Albums");
+                    case StubType.ContinueWatching: return _localization.GetLocalizedString("HeaderContinueWatching");
-            }
+                    case StubType.Movies:           return _localization.GetLocalizedString("Movies");
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Artists)
+                    case StubType.Collections:      return _localization.GetLocalizedString("Collections");
-            {
+                    case StubType.Favorites:        return _localization.GetLocalizedString("Favorites");
-                return _localization.GetLocalizedString("Artists");
+                    case StubType.NextUp:           return _localization.GetLocalizedString("HeaderNextUp");
-            }
+                    case StubType.FavoriteSeries:   return _localization.GetLocalizedString("HeaderFavoriteShows");
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Songs)
+                    case StubType.FavoriteEpisodes: return _localization.GetLocalizedString("HeaderFavoriteEpisodes");
-            {
+                    case StubType.Series:           return _localization.GetLocalizedString("Shows");
-                return _localization.GetLocalizedString("Songs");
+                    default: break;
-            }
+                }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Genres)
-            {
-                return _localization.GetLocalizedString("Genres");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteAlbums)
-            {
-                return _localization.GetLocalizedString("HeaderFavoriteAlbums");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteArtists)
-            {
-                return _localization.GetLocalizedString("HeaderFavoriteArtists");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteSongs)
-            {
-                return _localization.GetLocalizedString("HeaderFavoriteSongs");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.ContinueWatching)
-            {
-                return _localization.GetLocalizedString("HeaderContinueWatching");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Movies)
-            {
-                return _localization.GetLocalizedString("Movies");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Collections)
-            {
-                return _localization.GetLocalizedString("Collections");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Favorites)
-            {
-                return _localization.GetLocalizedString("Favorites");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.NextUp)
-            {
-                return _localization.GetLocalizedString("HeaderNextUp");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteSeries)
-            {
-                return _localization.GetLocalizedString("HeaderFavoriteShows");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteEpisodes)
-            {
-                return _localization.GetLocalizedString("HeaderFavoriteEpisodes");
-            }
-            if (itemStubType.HasValue && itemStubType.Value == StubType.Series)
-            {
-                return _localization.GetLocalizedString("Shows");
             }
 
-            var episode = item as Episode;
+            if (item is Episode episode && context is Season season)
-            var season = context as Season;
-
-            if (episode != null && season != null)
             {
                 // This is a special embedded within a season
-                if (item.ParentIndexNumber.HasValue && item.ParentIndexNumber.Value == 0)
+                if (item.ParentIndexNumber.HasValue && item.ParentIndexNumber.Value == 0
+                    && season.IndexNumber.HasValue && season.IndexNumber.Value != 0)
                 {
-                    if (season.IndexNumber.HasValue && season.IndexNumber.Value != 0)
+                    return string.Format(_localization.GetLocalizedString("ValueSpecialEpisodeName"), item.Name);
-                    {
-                        return string.Format(_localization.GetLocalizedString("ValueSpecialEpisodeName"), item.Name);
-                    }
                 }
 
                 if (item.IndexNumber.HasValue)
@@ -573,7 +533,7 @@ namespace Emby.Dlna.Didl
                 streamInfo.RunTimeTicks ?? 0,
                 streamInfo.TranscodeSeekInfo);
 
-            writer.WriteAttributeString("protocolInfo", String.Format(
+            writer.WriteAttributeString("protocolInfo", string.Format(
                 "http-get:*:{0}:{1}",
                 mimeType,
                 contentFeatures
@@ -586,10 +546,8 @@ namespace Emby.Dlna.Didl
 
         public static bool IsIdRoot(string id)
         {
-            if (string.IsNullOrWhiteSpace(id) ||
+            if (string.IsNullOrWhiteSpace(id)
-
+                || string.Equals(id, "0", StringComparison.OrdinalIgnoreCase)
-                string.Equals(id, "0", StringComparison.OrdinalIgnoreCase)
-
                 // Samsung sometimes uses 1 as root
                 || string.Equals(id, "1", StringComparison.OrdinalIgnoreCase))
             {
@@ -809,7 +767,7 @@ namespace Emby.Dlna.Didl
             {
                 writer.WriteString(_profile.RequiresPlainFolders ? "object.container.storageFolder" : "object.container.genre.musicGenre");
             }
-            else if (item is Genre || item is GameGenre)
+            else if (item is Genre)
             {
                 writer.WriteString(_profile.RequiresPlainFolders ? "object.container.storageFolder" : "object.container.genre");
             }
@@ -845,7 +803,7 @@ namespace Emby.Dlna.Didl
             //    var type = types.FirstOrDefault(i => string.Equals(i, actor.Type, StringComparison.OrdinalIgnoreCase) || string.Equals(i, actor.Role, StringComparison.OrdinalIgnoreCase))
             //        ?? PersonType.Actor;
 
-            //    AddValue(writer, "upnp", type.ToLower(), actor.Name, NS_UPNP);
+            //    AddValue(writer, "upnp", type.ToLowerInvariant(), actor.Name, NS_UPNP);
 
             //    index++;
 
@@ -933,13 +891,7 @@ namespace Emby.Dlna.Didl
 
         private void AddCover(BaseItem item, BaseItem context, StubType? stubType, XmlWriter writer)
         {
-            ImageDownloadInfo imageInfo = null;
+            ImageDownloadInfo imageInfo = GetImageInfo(item);
-
-            // Finally, just use the image from the item
-            if (imageInfo == null)
-            {
-                imageInfo = GetImageInfo(item);
-            }
 
             if (imageInfo == null)
             {
@@ -1017,7 +969,7 @@ namespace Emby.Dlna.Didl
             var contentFeatures = new ContentFeatureBuilder(_profile)
                 .BuildImageHeader(format, width, height, imageInfo.IsDirectStream, org_Pn);
 
-            writer.WriteAttributeString("protocolInfo", String.Format(
+            writer.WriteAttributeString("protocolInfo", string.Format(
                 "http-get:*:{0}:{1}",
                 GetMimeType("file." + format),
                 contentFeatures
@@ -1095,8 +1047,8 @@ namespace Emby.Dlna.Didl
             //{
             //    var size = _imageProcessor.GetImageSize(imageInfo);
 
-            //    width = Convert.ToInt32(size.Width);
+            //    width = size.Width;
-            //    height = Convert.ToInt32(size.Height);
+            //    height = size.Height;
             //}
             //catch
             //{
@@ -1119,7 +1071,7 @@ namespace Emby.Dlna.Didl
             };
         }
 
-        class ImageDownloadInfo
+        private class ImageDownloadInfo
         {
             internal Guid ItemId;
             internal string ImageTag;
@@ -1135,7 +1087,7 @@ namespace Emby.Dlna.Didl
             internal ItemImageInfo ItemImageInfo;
         }
 
-        class ImageUrlInfo
+        private class ImageUrlInfo
         {
             internal string Url;
 
@@ -1154,7 +1106,7 @@ namespace Emby.Dlna.Didl
 
             if (stubType.HasValue)
             {
-                id = stubType.Value.ToString().ToLower() + "_" + id;
+                id = stubType.Value.ToString().ToLowerInvariant() + "_" + id;
             }
 
             return id;
@@ -1169,8 +1121,7 @@ namespace Emby.Dlna.Didl
                 info.ImageTag,
                 format,
                 maxWidth.ToString(CultureInfo.InvariantCulture),
-                maxHeight.ToString(CultureInfo.InvariantCulture)
+                maxHeight.ToString(CultureInfo.InvariantCulture));
-                );
 
             var width = info.Width;
             var height = info.Height;
@@ -1179,15 +1130,11 @@ namespace Emby.Dlna.Didl
 
             if (width.HasValue && height.HasValue)
             {
-                var newSize = DrawingUtils.Resize(new ImageSize
+                var newSize = DrawingUtils.Resize(
-                {
+                        new ImageDimensions(width.Value, height.Value), 0, 0, maxWidth, maxHeight);
-                    Height = height.Value,
-                    Width = width.Value
 
-                }, 0, 0, maxWidth, maxHeight);
+                width = newSize.Width;
-
+                height = newSize.Height;
-                width = Convert.ToInt32(newSize.Width);
-                height = Convert.ToInt32(newSize.Height);
 
                 var normalizedFormat = format
                     .Replace("jpeg", "jpg", StringComparison.OrdinalIgnoreCase);

Emby.Dlna/Didl/Filter.cs

@@ -1,6 +1,5 @@
-using MediaBrowser.Model.Extensions;
 using System;
-using System.Collections.Generic;
+using MediaBrowser.Model.Extensions;
 
 namespace Emby.Dlna.Didl
 {

Emby.Dlna/Didl/StringWriterWithEncoding.cs

@@ -1,8 +1,6 @@
-using System;
+using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Emby.Dlna.Didl
 {
@@ -53,9 +51,6 @@ namespace Emby.Dlna.Didl
             _encoding = encoding;
         }
 
-        public override Encoding Encoding
+        public override Encoding Encoding => (null == _encoding) ? base.Encoding : _encoding;
-        {
-            get { return (null == _encoding) ? base.Encoding : _encoding; }
-        }
     }
 }

Emby.Dlna/DlnaManager.cs

@@ -1,24 +1,23 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Plugins;
-using Emby.Dlna.Profiles;
-using Emby.Dlna.Server;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Drawing;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using Emby.Dlna.Profiles;
+using Emby.Dlna.Server;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Reflection;
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna
 {
@@ -34,26 +33,27 @@ namespace Emby.Dlna
 
         private readonly Dictionary<string, Tuple<InternalProfileInfo, DeviceProfile>> _profiles = new Dictionary<string, Tuple<InternalProfileInfo, DeviceProfile>>(StringComparer.Ordinal);
 
-        public DlnaManager(IXmlSerializer xmlSerializer,
+        public DlnaManager(
+            IXmlSerializer xmlSerializer,
             IFileSystem fileSystem,
             IApplicationPaths appPaths,
-            ILogger logger,
+            ILoggerFactory loggerFactory,
             IJsonSerializer jsonSerializer, IServerApplicationHost appHost, IAssemblyInfo assemblyInfo)
         {
             _xmlSerializer = xmlSerializer;
             _fileSystem = fileSystem;
             _appPaths = appPaths;
-            _logger = logger;
+            _logger = loggerFactory.CreateLogger("Dlna");
             _jsonSerializer = jsonSerializer;
             _appHost = appHost;
             _assemblyInfo = assemblyInfo;
         }
 
-        public void InitProfiles()
+        public async Task InitProfilesAsync()
         {
             try
             {
-                ExtractSystemProfiles();
+                await ExtractSystemProfilesAsync();
                 LoadProfiles();
             }
             catch (Exception ex)
@@ -95,7 +95,7 @@ namespace Emby.Dlna
         {
             if (deviceInfo == null)
             {
-                throw new ArgumentNullException("deviceInfo");
+                throw new ArgumentNullException(nameof(deviceInfo));
             }
 
             var profile = GetProfiles()
@@ -207,7 +207,7 @@ namespace Emby.Dlna
         {
             if (headers == null)
             {
-                throw new ArgumentNullException("headers");
+                throw new ArgumentNullException(nameof(headers));
             }
 
             // Convert to case insensitive
@@ -241,9 +241,7 @@ namespace Emby.Dlna
                 return false;
             }
 
-            string value;
+            if (headers.TryGetValue(header.Name, out string value))
-
-            if (headers.TryGetValue(header.Name, out value))
             {
                 switch (header.Match)
                 {
@@ -263,21 +261,9 @@ namespace Emby.Dlna
             return false;
         }
 
-        private string UserProfilesPath
+        private string UserProfilesPath => Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "user");
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "user");
-            }
-        }
 
-        private string SystemProfilesPath
+        private string SystemProfilesPath => Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "system");
-        {
-            get
-            {
-                return Path.Combine(_appPaths.ConfigurationDirectoryPath, "dlna", "system");
-            }
-        }
 
         private IEnumerable<DeviceProfile> GetProfiles(string path, DeviceProfileType type)
         {
@@ -302,8 +288,7 @@ namespace Emby.Dlna
         {
             lock (_profiles)
             {
-                Tuple<InternalProfileInfo, DeviceProfile> profileTuple;
+                if (_profiles.TryGetValue(path, out Tuple<InternalProfileInfo, DeviceProfile> profileTuple))
-                if (_profiles.TryGetValue(path, out profileTuple))
                 {
                     return profileTuple.Item2;
                 }
@@ -316,7 +301,7 @@ namespace Emby.Dlna
 
                     profile = ReserializeProfile(tempProfile);
 
-                    profile.Id = path.ToLower().GetMD5().ToString("N");
+                    profile.Id = path.ToLowerInvariant().GetMD5().ToString("N");
 
                     _profiles[path] = new Tuple<InternalProfileInfo, DeviceProfile>(GetInternalProfileInfo(_fileSystem.GetFileInfo(path), type), profile);
 
@@ -335,7 +320,7 @@ namespace Emby.Dlna
         {
             if (string.IsNullOrEmpty(id))
             {
-                throw new ArgumentNullException("id");
+                throw new ArgumentNullException(nameof(id));
             }
 
             var info = GetProfileInfosInternal().First(i => string.Equals(i.Info.Id, id, StringComparison.OrdinalIgnoreCase));
@@ -368,14 +353,14 @@ namespace Emby.Dlna
 
                 Info = new DeviceProfileInfo
                 {
-                    Id = file.FullName.ToLower().GetMD5().ToString("N"),
+                    Id = file.FullName.ToLowerInvariant().GetMD5().ToString("N"),
                     Name = _fileSystem.GetFileNameWithoutExtension(file),
                     Type = type
                 }
             };
         }
 
-        private void ExtractSystemProfiles()
+        private async Task ExtractSystemProfilesAsync()
         {
             var namespaceName = GetType().Namespace + ".Profiles.Xml.";
 
@@ -395,18 +380,18 @@ namespace Emby.Dlna
 
                     if (!fileInfo.Exists || fileInfo.Length != stream.Length)
                     {
-                        _fileSystem.CreateDirectory(systemProfilesPath);
+                        Directory.CreateDirectory(systemProfilesPath);
 
                         using (var fileStream = _fileSystem.GetFileStream(path, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
                         {
-                            stream.CopyTo(fileStream);
+                            await stream.CopyToAsync(fileStream);
                         }
                     }
                 }
             }
 
             // Not necessary, but just to make it easy to find
-            _fileSystem.CreateDirectory(UserProfilesPath);
+            Directory.CreateDirectory(UserProfilesPath);
         }
 
         public void DeleteProfile(string id)
@@ -522,7 +507,7 @@ namespace Emby.Dlna
                 ? ImageFormat.Png
                 : ImageFormat.Jpg;
 
-            var resource = GetType().Namespace + ".Images." + filename.ToLower();
+            var resource = GetType().Namespace + ".Images." + filename.ToLowerInvariant();
 
             return new ImageStream
             {

Emby.Dlna/Emby.Dlna.csproj

@@ -1,4 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />

Emby.Dlna/EventSubscriptionResponse.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna
 {

Emby.Dlna/Eventing/EventManager.cs

@@ -1,7 +1,3 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Dlna;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -9,6 +5,9 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Eventing
 {
@@ -83,9 +82,7 @@ namespace Emby.Dlna.Eventing
                 // Starts with SECOND-
                 header = header.Split('-').Last();
 
-                int val;
+                if (int.TryParse(header, NumberStyles.Integer, _usCulture, out var val))
-
-                if (int.TryParse(header, NumberStyles.Integer, _usCulture, out val))
                 {
                     return val;
                 }
@@ -98,8 +95,7 @@ namespace Emby.Dlna.Eventing
         {
             _logger.LogDebug("Cancelling event subscription {0}", subscriptionId);
 
-            EventSubscription sub;
+            _subscriptions.TryRemove(subscriptionId, out EventSubscription sub);
-            _subscriptions.TryRemove(subscriptionId, out sub);
 
             return new EventSubscriptionResponse
             {
@@ -130,9 +126,7 @@ namespace Emby.Dlna.Eventing
 
         private EventSubscription GetSubscription(string id, bool throwOnMissing)
         {
-            EventSubscription e;
+            if (!_subscriptions.TryGetValue(id, out EventSubscription e) && throwOnMissing)
-
-            if (!_subscriptions.TryGetValue(id, out e) && throwOnMissing)
             {
                 throw new ResourceNotFoundException("Event with Id " + id + " not found.");
             }

Emby.Dlna/Eventing/EventSubscription.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.Eventing
 {
@@ -23,12 +23,6 @@ namespace Emby.Dlna.Eventing
             TriggerCount++;
         }
 
-        public bool IsExpired
+        public bool IsExpired => SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
-        {
-            get
-            {
-                return SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
-            }
-        }
     }
 }

Emby.Dlna/IConnectionManager.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IConnectionManager : IEventManager, IUpnpService

Emby.Dlna/IContentDirectory.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IContentDirectory : IEventManager, IUpnpService

Emby.Dlna/IEventManager.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IEventManager

Emby.Dlna/IMediaReceiverRegistrar.cs

@@ -1,4 +1,4 @@
-
+
 namespace Emby.Dlna
 {
     public interface IMediaReceiverRegistrar : IEventManager, IUpnpService

Emby.Dlna/IUpnpService.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
@@ -10,7 +10,7 @@ namespace Emby.Dlna
         /// <param name="headers">The headers.</param>
         /// <returns>System.String.</returns>
         string GetServiceXml(IDictionary<string, string> headers);
-        
+
         /// <summary>
         /// Processes the control request.
         /// </summary>

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -1,4 +1,10 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Dlna.PlayTo;
+using Emby.Dlna.Ssdp;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -6,25 +12,18 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.TV;
-using Emby.Dlna.PlayTo;
-using Emby.Dlna.Ssdp;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.System;
-using MediaBrowser.Model.Threading;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 using Rssdp;
 using Rssdp.Infrastructure;
-using System.Threading;
 
 namespace Emby.Dlna.Main
 {
@@ -49,8 +48,7 @@ namespace Emby.Dlna.Main
         private readonly IDeviceDiscovery _deviceDiscovery;
 
         private SsdpDevicePublisher _Publisher;
-
+        
-        private readonly ITimerFactory _timerFactory;
         private readonly ISocketFactory _socketFactory;
         private readonly IEnvironmentInfo _environmentInfo;
         private readonly INetworkManager _networkManager;
@@ -75,11 +73,10 @@ namespace Emby.Dlna.Main
             IUserDataManager userDataManager,
             ILocalizationManager localizationManager,
             IMediaSourceManager mediaSourceManager,
-            IDeviceDiscovery deviceDiscovery, 
+            IDeviceDiscovery deviceDiscovery,
-            IMediaEncoder mediaEncoder, 
+            IMediaEncoder mediaEncoder,
-            ISocketFactory socketFactory, 
+            ISocketFactory socketFactory,
-            ITimerFactory timerFactory, 
+            IEnvironmentInfo environmentInfo,
-            IEnvironmentInfo environmentInfo, 
             INetworkManager networkManager,
             IUserViewManager userViewManager,
             IXmlReaderSettingsFactory xmlReaderSettingsFactory,
@@ -99,24 +96,23 @@ namespace Emby.Dlna.Main
             _deviceDiscovery = deviceDiscovery;
             _mediaEncoder = mediaEncoder;
             _socketFactory = socketFactory;
-            _timerFactory = timerFactory;
             _environmentInfo = environmentInfo;
             _networkManager = networkManager;
             _logger = loggerFactory.CreateLogger("Dlna");
 
-            ContentDirectory = new ContentDirectory.ContentDirectory(dlnaManager, 
+            ContentDirectory = new ContentDirectory.ContentDirectory(dlnaManager,
-                userDataManager, 
+                userDataManager,
-                imageProcessor, 
+                imageProcessor,
-                libraryManager, 
+                libraryManager,
-                config, 
+                config,
-                userManager, 
+                userManager,
-                _logger, 
+                _logger,
-                httpClient, 
+                httpClient,
-                localizationManager, 
+                localizationManager,
-                mediaSourceManager, 
+                mediaSourceManager,
                 userViewManager,
-                mediaEncoder, 
+                mediaEncoder,
-                xmlReaderSettingsFactory, 
+                xmlReaderSettingsFactory,
                 tvSeriesManager);
 
             ConnectionManager = new ConnectionManager.ConnectionManager(dlnaManager, config, _logger, httpClient, xmlReaderSettingsFactory);
@@ -125,9 +121,9 @@ namespace Emby.Dlna.Main
             Current = this;
         }
 
-        public void Run()
+        public async Task RunAsync()
         {
-            ((DlnaManager)_dlnaManager).InitProfiles();
+            await ((DlnaManager)_dlnaManager).InitProfilesAsync().ConfigureAwait(false);
 
             ReloadComponents();
 
@@ -233,7 +229,7 @@ namespace Emby.Dlna.Main
 
             try
             {
-                _Publisher = new SsdpDevicePublisher(_communicationsServer, _timerFactory, _environmentInfo.OperatingSystemName, _environmentInfo.OperatingSystemVersion);
+                _Publisher = new SsdpDevicePublisher(_communicationsServer, _environmentInfo.OperatingSystemName, _environmentInfo.OperatingSystemVersion);
                 _Publisher.LogFunction = LogMessage;
                 _Publisher.SupportPnpRootDevice = false;
 
@@ -263,7 +259,7 @@ namespace Emby.Dlna.Main
 
                 var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
 
-                _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address.ToString());
+                _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address);
 
                 var descriptorUri = "/dlna/" + udn + "/description.xml";
                 var uri = new Uri(_appHost.GetLocalApiUrl(address) + descriptorUri);
@@ -271,18 +267,18 @@ namespace Emby.Dlna.Main
                 var device = new SsdpRootDevice
                 {
                     CacheLifetime = TimeSpan.FromSeconds(1800), //How long SSDP clients can cache this info.
-                    Location = uri, // Must point to the URL that serves your devices UPnP description document. 
+                    Location = uri, // Must point to the URL that serves your devices UPnP description document.
                     FriendlyName = "Jellyfin",
                     Manufacturer = "Jellyfin",
                     ModelName = "Jellyfin Server",
                     Uuid = udn
-                    // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.                
+                    // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.
                 };
 
                 SetProperies(device, fullService);
                 _Publisher.AddDevice(device);
 
-                var embeddedDevices = new []
+                var embeddedDevices = new[]
                 {
                     "urn:schemas-upnp-org:service:ContentDirectory:1",
                     "urn:schemas-upnp-org:service:ConnectionManager:1",
@@ -297,7 +293,7 @@ namespace Emby.Dlna.Main
                         Manufacturer = device.Manufacturer,
                         ModelName = device.ModelName,
                         Uuid = udn
-                        // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.                
+                        // This must be a globally unique value that survives reboots etc. Get from storage or embedded hardware etc.
                     };
 
                     SetProperies(embeddedDevice, subDevice);
@@ -308,8 +304,7 @@ namespace Emby.Dlna.Main
 
         private string CreateUuid(string text)
         {
-            Guid guid;
+            if (!Guid.TryParse(text, out var guid))
-            if (!Guid.TryParse(text, out guid))
             {
                 guid = text.GetMD5();
             }
@@ -354,8 +349,7 @@ namespace Emby.Dlna.Main
                         _userDataManager,
                         _localization,
                         _mediaSourceManager,
-                        _mediaEncoder,
+                        _mediaEncoder);
-                        _timerFactory);
 
                     _manager.Start();
                 }

Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs

@@ -1,11 +1,10 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Server;
-using Emby.Dlna.Service;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {
@@ -21,7 +20,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
             throw new ResourceNotFoundException("Unexpected control request name: " + methodName);
         }
 
-        private IEnumerable<KeyValuePair<string, string>> HandleIsAuthorized()
+        private static IEnumerable<KeyValuePair<string, string>> HandleIsAuthorized()
         {
             return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {
@@ -29,7 +28,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
             };
         }
 
-        private IEnumerable<KeyValuePair<string, string>> HandleIsValidated()
+        private static IEnumerable<KeyValuePair<string, string>> HandleIsValidated()
         {
             return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
             {

Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs

@@ -1,11 +1,9 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
-using Emby.Dlna.Service;
-using Microsoft.Extensions.Logging;
-using System;
 using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {

Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs

@@ -1,6 +1,6 @@
-using Emby.Dlna.Common;
-using Emby.Dlna.Service;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
+using Emby.Dlna.Service;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {
@@ -12,7 +12,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
                 GetStateVariables());
         }
 
-        private IEnumerable<StateVariable> GetStateVariables()
+        private static IEnumerable<StateVariable> GetStateVariables()
         {
             var list = new List<StateVariable>();
 

Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs

@@ -1,5 +1,5 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {
@@ -7,7 +7,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
     {
         public IEnumerable<ServiceAction> GetActions()
         {
-            return new []
+            return new[]
             {
                 GetIsValidated(),
                 GetIsAuthorized(),
@@ -19,7 +19,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
             };
         }
 
-        private ServiceAction GetIsValidated()
+        private static ServiceAction GetIsValidated()
         {
             var action = new ServiceAction
             {
@@ -41,7 +41,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
             return action;
         }
 
-        private ServiceAction GetIsAuthorized()
+        private static ServiceAction GetIsAuthorized()
         {
             var action = new ServiceAction
             {
@@ -63,7 +63,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
             return action;
         }
 
-        private ServiceAction GetRegisterDevice()
+        private static ServiceAction GetRegisterDevice()
         {
             var action = new ServiceAction
             {
@@ -85,7 +85,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
             return action;
         }
 
-        private ServiceAction GetGetValidationSucceededUpdateID()
+        private static ServiceAction GetGetValidationSucceededUpdateID()
         {
             var action = new ServiceAction
             {

Emby.Dlna/PlayTo/CurrentIdEventArgs.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
     public class CurrentIdEventArgs : EventArgs
     {
-        public string Id { get;  set; }
+        public string Id { get; set; }
     }
 }

Emby.Dlna/PlayTo/Device.cs

@@ -1,21 +1,16 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Common;
-using Emby.Dlna.Ssdp;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Net;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net;
-using System.Security;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using Emby.Dlna.Common;
 using Emby.Dlna.Server;
-using MediaBrowser.Model.Threading;
+using Emby.Dlna.Ssdp;
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -23,7 +18,7 @@ namespace Emby.Dlna.PlayTo
     {
         #region Fields & Properties
 
-        private ITimer _timer;
+        private Timer _timer;
 
         public DeviceInfo Properties { get; set; }
 
@@ -39,52 +34,20 @@ namespace Emby.Dlna.PlayTo
                 RefreshVolumeIfNeeded();
                 return _volume;
             }
-            set
+            set => _volume = value;
-            {
-                _volume = value;
-            }
         }
 
         public TimeSpan? Duration { get; set; }
 
-        private TimeSpan _position = TimeSpan.FromSeconds(0);
+        public TimeSpan Position { get; set; } = TimeSpan.FromSeconds(0);
-        public TimeSpan Position
-        {
-            get
-            {
-                return _position;
-            }
-            set
-            {
-                _position = value;
-            }
-        }
 
         public TRANSPORTSTATE TransportState { get; private set; }
 
-        public bool IsPlaying
+        public bool IsPlaying => TransportState == TRANSPORTSTATE.PLAYING;
-        {
-            get
-            {
-                return TransportState == TRANSPORTSTATE.PLAYING;
-            }
-        }
 
-        public bool IsPaused
+        public bool IsPaused => TransportState == TRANSPORTSTATE.PAUSED || TransportState == TRANSPORTSTATE.PAUSED_PLAYBACK;
-        {
-            get
-            {
-                return TransportState == TRANSPORTSTATE.PAUSED || TransportState == TRANSPORTSTATE.PAUSED_PLAYBACK;
-            }
-        }
 
-        public bool IsStopped
+        public bool IsStopped => TransportState == TRANSPORTSTATE.STOPPED;
-        {
-            get
-            {
-                return TransportState == TRANSPORTSTATE.STOPPED;
-            }
-        }
 
         #endregion
 
@@ -92,24 +55,20 @@ namespace Emby.Dlna.PlayTo
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
 
-        public DateTime DateLastActivity { get; private set; }
         public Action OnDeviceUnavailable { get; set; }
 
-        private readonly ITimerFactory _timerFactory;
+        public Device(DeviceInfo deviceProperties, IHttpClient httpClient, ILogger logger, IServerConfigurationManager config)
-
-        public Device(DeviceInfo deviceProperties, IHttpClient httpClient, ILogger logger, IServerConfigurationManager config, ITimerFactory timerFactory)
         {
             Properties = deviceProperties;
             _httpClient = httpClient;
             _logger = logger;
             _config = config;
-            _timerFactory = timerFactory;
         }
 
         public void Start()
         {
             _logger.LogDebug("Dlna Device.Start");
-            _timer = _timerFactory.Create(TimerCallback, null, 1000, Timeout.Infinite);
+            _timer = new Timer(TimerCallback, null, 1000, Timeout.Infinite);
         }
 
         private DateTime _lastVolumeRefresh;
@@ -150,7 +109,9 @@ namespace Emby.Dlna.PlayTo
             lock (_timerLock)
             {
                 if (_disposed)
+                {
                     return;
+                }
 
                 _volumeRefreshActive = true;
 
@@ -167,7 +128,9 @@ namespace Emby.Dlna.PlayTo
             lock (_timerLock)
             {
                 if (_disposed)
+                {
                     return;
+                }
 
                 _volumeRefreshActive = false;
 
@@ -175,11 +138,6 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        public void OnPlaybackStartedExternally()
-        {
-            RestartTimer(true);
-        }
-
         #region Commanding
 
         public Task VolumeDown(CancellationToken cancellationToken)
@@ -311,7 +269,7 @@ namespace Emby.Dlna.PlayTo
                 throw new InvalidOperationException("Unable to find service");
             }
 
-            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, String.Format("{0:hh}:{0:mm}:{0:ss}", value), "REL_TIME"))
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, string.Format("{0:hh}:{0:mm}:{0:ss}", value), "REL_TIME"))
                 .ConfigureAwait(false);
 
             RestartTimer(true);
@@ -364,7 +322,9 @@ namespace Emby.Dlna.PlayTo
         private string CreateDidlMeta(string value)
         {
             if (string.IsNullOrEmpty(value))
-                return String.Empty;
+            {
+                return string.Empty;
+            }
 
             return DescriptionXmlBuilder.Escape(value);
         }
@@ -373,10 +333,11 @@ namespace Emby.Dlna.PlayTo
         {
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "Play");
             if (command == null)
+            {
                 return Task.CompletedTask;
+            }
 
             var service = GetAvTransportService();
-
             if (service == null)
             {
                 throw new InvalidOperationException("Unable to find service");
@@ -400,7 +361,9 @@ namespace Emby.Dlna.PlayTo
 
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "Stop");
             if (command == null)
+            {
                 return;
+            }
 
             var service = GetAvTransportService();
 
@@ -416,7 +379,9 @@ namespace Emby.Dlna.PlayTo
 
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "Pause");
             if (command == null)
+            {
                 return;
+            }
 
             var service = GetAvTransportService();
 
@@ -436,7 +401,9 @@ namespace Emby.Dlna.PlayTo
         private async void TimerCallback(object sender)
         {
             if (_disposed)
+            {
                 return;
+            }
 
             try
             {
@@ -456,8 +423,6 @@ namespace Emby.Dlna.PlayTo
                     return;
                 }
 
-                DateLastActivity = DateTime.UtcNow;
-
                 if (transportState.HasValue)
                 {
                     // If we're not playing anything no need to get additional data
@@ -536,7 +501,9 @@ namespace Emby.Dlna.PlayTo
 
             var command = rendererCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetVolume");
             if (command == null)
+            {
                 return;
+            }
 
             var service = GetServiceRenderingControl();
 
@@ -549,13 +516,17 @@ namespace Emby.Dlna.PlayTo
                 .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
+            {
                 return;
+            }
 
             var volume = result.Document.Descendants(uPnpNamespaces.RenderingControl + "GetVolumeResponse").Select(i => i.Element("CurrentVolume")).FirstOrDefault(i => i != null);
-            var volumeValue = volume == null ? null : volume.Value;
+            var volumeValue = volume?.Value;
 
             if (string.IsNullOrWhiteSpace(volumeValue))
+            {
                 return;
+            }
 
             Volume = int.Parse(volumeValue, UsCulture);
 
@@ -576,7 +547,9 @@ namespace Emby.Dlna.PlayTo
 
             var command = rendererCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetMute");
             if (command == null)
+            {
                 return;
+            }
 
             var service = GetServiceRenderingControl();
 
@@ -591,41 +564,44 @@ namespace Emby.Dlna.PlayTo
             if (result == null || result.Document == null)
                 return;
 
-            var valueNode = result.Document.Descendants(uPnpNamespaces.RenderingControl + "GetMuteResponse").Select(i => i.Element("CurrentMute")).FirstOrDefault(i => i != null);
+            var valueNode = result.Document.Descendants(uPnpNamespaces.RenderingControl + "GetMuteResponse")
-            var value = valueNode == null ? null : valueNode.Value;
+                                            .Select(i => i.Element("CurrentMute"))
+                                            .FirstOrDefault(i => i != null);
 
-            IsMuted = string.Equals(value, "1", StringComparison.OrdinalIgnoreCase);
+            IsMuted = string.Equals(valueNode?.Value, "1", StringComparison.OrdinalIgnoreCase);
         }
 
         private async Task<TRANSPORTSTATE?> GetTransportInfo(TransportCommands avCommands, CancellationToken cancellationToken)
         {
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetTransportInfo");
             if (command == null)
+            {
                 return null;
+            }
 
             var service = GetAvTransportService();
             if (service == null)
+            {
                 return null;
+            }
 
             var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType), false)
                 .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
+            {
                 return null;
+            }
 
             var transportState =
                 result.Document.Descendants(uPnpNamespaces.AvTransport + "GetTransportInfoResponse").Select(i => i.Element("CurrentTransportState")).FirstOrDefault(i => i != null);
 
             var transportStateValue = transportState == null ? null : transportState.Value;
 
-            if (transportStateValue != null)
+            if (transportStateValue != null
+                && Enum.TryParse(transportStateValue, true, out TRANSPORTSTATE state))
             {
-                TRANSPORTSTATE state;
+                return state;
-
-                if (Enum.TryParse(transportStateValue, true, out state))
-                {
-                    return state;
-                }
             }
 
             return null;
@@ -635,10 +611,11 @@ namespace Emby.Dlna.PlayTo
         {
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetMediaInfo");
             if (command == null)
+            {
                 return null;
+            }
 
             var service = GetAvTransportService();
-
             if (service == null)
             {
                 throw new InvalidOperationException("Unable to find service");
@@ -650,7 +627,9 @@ namespace Emby.Dlna.PlayTo
                 .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
+            {
                 return null;
+            }
 
             var track = result.Document.Descendants("CurrentURIMetaData").FirstOrDefault();
 
@@ -690,11 +669,13 @@ namespace Emby.Dlna.PlayTo
             return null;
         }
 
-        private async Task<Tuple<bool, uBaseObject>> GetPositionInfo(TransportCommands avCommands, CancellationToken cancellationToken)
+        private async Task<(bool, uBaseObject)> GetPositionInfo(TransportCommands avCommands, CancellationToken cancellationToken)
         {
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "GetPositionInfo");
             if (command == null)
-                return new Tuple<bool, uBaseObject>(false, null);
+            {
+                return (false, null);
+            }
 
             var service = GetAvTransportService();
 
@@ -709,7 +690,9 @@ namespace Emby.Dlna.PlayTo
                 .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
-                return new Tuple<bool, uBaseObject>(false, null);
+            {
+                return (false, null);
+            }
 
             var trackUriElem = result.Document.Descendants(uPnpNamespaces.AvTransport + "GetPositionInfoResponse").Select(i => i.Element("TrackURI")).FirstOrDefault(i => i != null);
             var trackUri = trackUriElem == null ? null : trackUriElem.Value;
@@ -717,8 +700,8 @@ namespace Emby.Dlna.PlayTo
             var durationElem = result.Document.Descendants(uPnpNamespaces.AvTransport + "GetPositionInfoResponse").Select(i => i.Element("TrackDuration")).FirstOrDefault(i => i != null);
             var duration = durationElem == null ? null : durationElem.Value;
 
-            if (!string.IsNullOrWhiteSpace(duration) &&
+            if (!string.IsNullOrWhiteSpace(duration)
-                !string.Equals(duration, "NOT_IMPLEMENTED", StringComparison.OrdinalIgnoreCase))
+                && !string.Equals(duration, "NOT_IMPLEMENTED", StringComparison.OrdinalIgnoreCase))
             {
                 Duration = TimeSpan.Parse(duration, UsCulture);
             }
@@ -739,15 +722,15 @@ namespace Emby.Dlna.PlayTo
 
             if (track == null)
             {
-                //If track is null, some vendors do this, use GetMediaInfo instead                    
+                //If track is null, some vendors do this, use GetMediaInfo instead
-                return new Tuple<bool, uBaseObject>(true, null);
+                return (true, null);
             }
 
             var trackString = (string)track;
 
             if (string.IsNullOrWhiteSpace(trackString) || string.Equals(trackString, "NOT_IMPLEMENTED", StringComparison.OrdinalIgnoreCase))
             {
-                return new Tuple<bool, uBaseObject>(true, null);
+                return (true, null);
             }
 
             XElement uPnpResponse;
@@ -768,7 +751,7 @@ namespace Emby.Dlna.PlayTo
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Unable to parse xml {0}", trackString);
-                    return new Tuple<bool, uBaseObject>(true, null);
+                    return (true, null);
                 }
             }
 
@@ -776,14 +759,14 @@ namespace Emby.Dlna.PlayTo
 
             var uTrack = CreateUBaseObject(e, trackUri);
 
-            return new Tuple<bool, uBaseObject>(true, uTrack);
+            return (true, uTrack);
         }
 
         private static uBaseObject CreateUBaseObject(XElement container, string trackUri)
         {
             if (container == null)
             {
-                throw new ArgumentNullException("container");
+                throw new ArgumentNullException(nameof(container));
             }
 
             var url = container.GetValue(uPnpNamespaces.Res);
@@ -810,7 +793,7 @@ namespace Emby.Dlna.PlayTo
         {
             if (container == null)
             {
-                throw new ArgumentNullException("container");
+                throw new ArgumentNullException(nameof(container));
             }
 
             var resElement = container.Element(uPnpNamespaces.Res);
@@ -834,11 +817,9 @@ namespace Emby.Dlna.PlayTo
 
         private async Task<TransportCommands> GetAVProtocolAsync(CancellationToken cancellationToken)
         {
-            var avCommands = AvCommands;
+            if (AvCommands != null)
-
-            if (avCommands != null)
             {
-                return avCommands;
+                return AvCommands;
             }
 
             if (_disposed)
@@ -858,18 +839,15 @@ namespace Emby.Dlna.PlayTo
 
             var document = await httpClient.GetDataAsync(url, cancellationToken).ConfigureAwait(false);
 
-            avCommands = TransportCommands.Create(document);
+            AvCommands = TransportCommands.Create(document);
-            AvCommands = avCommands;
+            return AvCommands;
-            return avCommands;
         }
 
         private async Task<TransportCommands> GetRenderingProtocolAsync(CancellationToken cancellationToken)
         {
-            var rendererCommands = RendererCommands;
+            if (RendererCommands != null)
-
-            if (rendererCommands != null)
             {
-                return rendererCommands;
+                return RendererCommands;
             }
 
             if (_disposed)
@@ -878,7 +856,6 @@ namespace Emby.Dlna.PlayTo
             }
 
             var avService = GetServiceRenderingControl();
-
             if (avService == null)
             {
                 throw new ArgumentException("Device AvService is null");
@@ -890,9 +867,8 @@ namespace Emby.Dlna.PlayTo
             _logger.LogDebug("Dlna Device.GetRenderingProtocolAsync");
             var document = await httpClient.GetDataAsync(url, cancellationToken).ConfigureAwait(false);
 
-            rendererCommands = TransportCommands.Create(document);
+            RendererCommands = TransportCommands.Create(document);
-            RendererCommands = rendererCommands;
+            return RendererCommands;
-            return rendererCommands;
         }
 
         private string NormalizeUrl(string baseUrl, string url)
@@ -904,85 +880,103 @@ namespace Emby.Dlna.PlayTo
             }
 
             if (!url.Contains("/"))
+            {
                 url = "/dmr/" + url;
+            }
+
             if (!url.StartsWith("/"))
+            {
                 url = "/" + url;
+            }
 
             return baseUrl + url;
         }
 
-        private TransportCommands AvCommands
+        private TransportCommands AvCommands { get; set; }
-        {
-            get;
-            set;
-        }
 
-        private TransportCommands RendererCommands
+        private TransportCommands RendererCommands { get; set; }
-        {
-            get;
-            set;
-        }
 
-        public static async Task<Device> CreateuPnpDeviceAsync(Uri url, IHttpClient httpClient, IServerConfigurationManager config, ILogger logger, ITimerFactory timerFactory, CancellationToken cancellationToken)
+        public static async Task<Device> CreateuPnpDeviceAsync(Uri url, IHttpClient httpClient, IServerConfigurationManager config, ILogger logger, CancellationToken cancellationToken)
         {
             var ssdpHttpClient = new SsdpHttpClient(httpClient, config);
 
             var document = await ssdpHttpClient.GetDataAsync(url.ToString(), cancellationToken).ConfigureAwait(false);
 
-            var deviceProperties = new DeviceInfo();
-
             var friendlyNames = new List<string>();
 
             var name = document.Descendants(uPnpNamespaces.ud.GetName("friendlyName")).FirstOrDefault();
             if (name != null && !string.IsNullOrWhiteSpace(name.Value))
+            {
                 friendlyNames.Add(name.Value);
+            }
 
             var room = document.Descendants(uPnpNamespaces.ud.GetName("roomName")).FirstOrDefault();
             if (room != null && !string.IsNullOrWhiteSpace(room.Value))
+            {
                 friendlyNames.Add(room.Value);
+            }
 
-            deviceProperties.Name = string.Join(" ", friendlyNames.ToArray());
+            var deviceProperties = new DeviceInfo()
+            {
+                Name = string.Join(" ", friendlyNames),
+                BaseUrl = string.Format("http://{0}:{1}", url.Host, url.Port)
+            };
 
             var model = document.Descendants(uPnpNamespaces.ud.GetName("modelName")).FirstOrDefault();
             if (model != null)
+            {
                 deviceProperties.ModelName = model.Value;
+            }
 
             var modelNumber = document.Descendants(uPnpNamespaces.ud.GetName("modelNumber")).FirstOrDefault();
             if (modelNumber != null)
+            {
                 deviceProperties.ModelNumber = modelNumber.Value;
+            }
 
             var uuid = document.Descendants(uPnpNamespaces.ud.GetName("UDN")).FirstOrDefault();
             if (uuid != null)
+            {
                 deviceProperties.UUID = uuid.Value;
+            }
 
             var manufacturer = document.Descendants(uPnpNamespaces.ud.GetName("manufacturer")).FirstOrDefault();
             if (manufacturer != null)
+            {
                 deviceProperties.Manufacturer = manufacturer.Value;
+            }
 
             var manufacturerUrl = document.Descendants(uPnpNamespaces.ud.GetName("manufacturerURL")).FirstOrDefault();
             if (manufacturerUrl != null)
+            {
                 deviceProperties.ManufacturerUrl = manufacturerUrl.Value;
+            }
 
             var presentationUrl = document.Descendants(uPnpNamespaces.ud.GetName("presentationURL")).FirstOrDefault();
             if (presentationUrl != null)
+            {
                 deviceProperties.PresentationUrl = presentationUrl.Value;
+            }
 
             var modelUrl = document.Descendants(uPnpNamespaces.ud.GetName("modelURL")).FirstOrDefault();
             if (modelUrl != null)
+            {
                 deviceProperties.ModelUrl = modelUrl.Value;
+            }
 
             var serialNumber = document.Descendants(uPnpNamespaces.ud.GetName("serialNumber")).FirstOrDefault();
             if (serialNumber != null)
+            {
                 deviceProperties.SerialNumber = serialNumber.Value;
+            }
 
             var modelDescription = document.Descendants(uPnpNamespaces.ud.GetName("modelDescription")).FirstOrDefault();
             if (modelDescription != null)
+            {
                 deviceProperties.ModelDescription = modelDescription.Value;
-
+            }
-            deviceProperties.BaseUrl = String.Format("http://{0}:{1}", url.Host, url.Port);
 
             var icon = document.Descendants(uPnpNamespaces.ud.GetName("icon")).FirstOrDefault();
-
             if (icon != null)
             {
                 deviceProperties.Icon = CreateIcon(icon);
@@ -991,12 +985,15 @@ namespace Emby.Dlna.PlayTo
             foreach (var services in document.Descendants(uPnpNamespaces.ud.GetName("serviceList")))
             {
                 if (services == null)
+                {
                     continue;
+                }
 
                 var servicesList = services.Descendants(uPnpNamespaces.ud.GetName("service"));
-
                 if (servicesList == null)
+                {
                     continue;
+                }
 
                 foreach (var element in servicesList)
                 {
@@ -1009,9 +1006,7 @@ namespace Emby.Dlna.PlayTo
                 }
             }
 
-            var device = new Device(deviceProperties, httpClient, logger, config, timerFactory);
+            return new Device(deviceProperties, httpClient, logger, config);
-
-            return device;
         }
 
         #endregion
@@ -1021,7 +1016,7 @@ namespace Emby.Dlna.PlayTo
         {
             if (element == null)
             {
-                throw new ArgumentNullException("element");
+                throw new ArgumentNullException(nameof(element));
             }
 
             var mimeType = element.GetDescendantValue(uPnpNamespaces.ud.GetName("mimetype"));
@@ -1098,13 +1093,10 @@ namespace Emby.Dlna.PlayTo
 
         private void OnPlaybackStart(uBaseObject mediaInfo)
         {
-            if (PlaybackStart != null)
+            PlaybackStart?.Invoke(this, new PlaybackStartEventArgs
             {
-                PlaybackStart.Invoke(this, new PlaybackStartEventArgs
+                MediaInfo = mediaInfo
-                {
+            });
-                    MediaInfo = mediaInfo
-                });
-            }
         }
 
         private void OnPlaybackProgress(uBaseObject mediaInfo)
@@ -1115,65 +1107,63 @@ namespace Emby.Dlna.PlayTo
                 return;
             }
 
-            if (PlaybackProgress != null)
+            PlaybackProgress?.Invoke(this, new PlaybackProgressEventArgs
             {
-                PlaybackProgress.Invoke(this, new PlaybackProgressEventArgs
+                MediaInfo = mediaInfo
-                {
+            });
-                    MediaInfo = mediaInfo
-                });
-            }
         }
 
         private void OnPlaybackStop(uBaseObject mediaInfo)
         {
-            if (PlaybackStopped != null)
+
+            PlaybackStopped?.Invoke(this, new PlaybackStoppedEventArgs
             {
-                PlaybackStopped.Invoke(this, new PlaybackStoppedEventArgs
+                MediaInfo = mediaInfo
-                {
+            });
-                    MediaInfo = mediaInfo
-                });
-            }
         }
 
         private void OnMediaChanged(uBaseObject old, uBaseObject newMedia)
         {
-            if (MediaChanged != null)
+            MediaChanged?.Invoke(this, new MediaChangedEventArgs
             {
-                MediaChanged.Invoke(this, new MediaChangedEventArgs
+                OldMediaInfo = old,
-                {
+                NewMediaInfo = newMedia
-                    OldMediaInfo = old,
+            });
-                    NewMediaInfo = newMedia
-                });
-            }
         }
 
         #region IDisposable
 
         bool _disposed;
+
         public void Dispose()
         {
-            if (!_disposed)
+            Dispose(true);
-            {
+            GC.SuppressFinalize(this);
-                _disposed = true;
-
-                DisposeTimer();
-            }
         }
 
-        private void DisposeTimer()
+        protected virtual void Dispose(bool disposing)
         {
-            if (_timer != null)
+            if (_disposed)
             {
-                _timer.Dispose();
+                return;
-                _timer = null;
             }
+
+            if (disposing)
+            {
+                _timer?.Dispose();
+            }
+
+            _timer = null;
+            Properties = null;
+
+            _disposed = true;
         }
 
         #endregion
 
         public override string ToString()
         {
-            return String.Format("{0} - {1}", Properties.Name, Properties.BaseUrl);
+            return string.Format("{0} - {1}", Properties.Name, Properties.BaseUrl);
         }
     }
 }

Emby.Dlna/PlayTo/DeviceInfo.cs

@@ -1,6 +1,6 @@
-using Emby.Dlna.Common;
-using MediaBrowser.Model.Dlna;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -34,26 +34,14 @@ namespace Emby.Dlna.PlayTo
         private string _baseUrl = string.Empty;
         public string BaseUrl
         {
-            get
+            get => _baseUrl;
-            {
+            set => _baseUrl = value;
-                return _baseUrl;
-            }
-            set
-            {
-                _baseUrl = value;
-            }
         }
 
         public DeviceIcon Icon { get; set; }
 
         private readonly List<DeviceService> _services = new List<DeviceService>();
-        public List<DeviceService> Services
+        public List<DeviceService> Services => _services;
-        {
-            get
-            {
-                return _services;
-            }
-        }
 
         public DeviceIdentification ToDeviceIdentification()
         {

Emby.Dlna/PlayTo/PlayToController.cs

@@ -1,28 +1,25 @@
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Session;
-using Emby.Dlna.Didl;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.System;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Dlna.Didl;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.Extensions;
-using System.Net.Http;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Session;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -45,39 +42,43 @@ namespace Emby.Dlna.PlayTo
         private readonly IDeviceDiscovery _deviceDiscovery;
         private readonly string _serverAddress;
         private readonly string _accessToken;
-        private readonly DateTime _creationTime;
 
-        public bool IsSessionActive
+        public bool IsSessionActive => !_disposed && _device != null;
-        {
-            get
-            {
-                return !_disposed && _device != null;
-            }
-        }
 
-        public bool SupportsMediaControl
+        public bool SupportsMediaControl => IsSessionActive;
-        {
-            get { return IsSessionActive; }
-        }
 
-        public PlayToController(SessionInfo session, ISessionManager sessionManager, ILibraryManager libraryManager, ILogger logger, IDlnaManager dlnaManager, IUserManager userManager, IImageProcessor imageProcessor, string serverAddress, string accessToken, IDeviceDiscovery deviceDiscovery, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IConfigurationManager config, IMediaEncoder mediaEncoder)
+        public PlayToController(
+            SessionInfo session,
+            ISessionManager sessionManager,
+            ILibraryManager libraryManager,
+            ILogger logger,
+            IDlnaManager dlnaManager,
+            IUserManager userManager,
+            IImageProcessor imageProcessor,
+            string serverAddress,
+            string accessToken,
+            IDeviceDiscovery deviceDiscovery,
+            IUserDataManager userDataManager,
+            ILocalizationManager localization,
+            IMediaSourceManager mediaSourceManager,
+            IConfigurationManager config,
+            IMediaEncoder mediaEncoder)
         {
             _session = session;
             _sessionManager = sessionManager;
             _libraryManager = libraryManager;
+            _logger = logger;
             _dlnaManager = dlnaManager;
             _userManager = userManager;
             _imageProcessor = imageProcessor;
             _serverAddress = serverAddress;
+            _accessToken = accessToken;
             _deviceDiscovery = deviceDiscovery;
             _userDataManager = userDataManager;
             _localization = localization;
             _mediaSourceManager = mediaSourceManager;
             _config = config;
             _mediaEncoder = mediaEncoder;
-            _accessToken = accessToken;
-            _logger = logger;
-            _creationTime = DateTime.UtcNow;
         }
 
         public void Init(Device device)
@@ -110,14 +111,11 @@ namespace Emby.Dlna.PlayTo
         {
             var info = e.Argument;
 
-            string nts;
+            info.Headers.TryGetValue("NTS", out string nts);
-            info.Headers.TryGetValue("NTS", out nts);
 
-            string usn;
+            if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty;
-            if (!info.Headers.TryGetValue("USN", out usn)) usn = String.Empty;
 
-            string nt;
+            if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty;
-            if (!info.Headers.TryGetValue("NT", out nt)) nt = String.Empty;
 
             if (usn.IndexOf(_device.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1 &&
                 !_disposed)
@@ -389,9 +387,7 @@ namespace Emby.Dlna.PlayTo
                     return _device.IsPaused ? _device.SetPlay(CancellationToken.None) : _device.SetPause(CancellationToken.None);
 
                 case PlaystateCommand.Seek:
-                    {
+                    return Seek(command.SeekPositionTicks ?? 0);
-                        return Seek(command.SeekPositionTicks ?? 0);
-                    }
 
                 case PlaystateCommand.NextTrack:
                     return SetPlaylistIndex(_currentPlaylistIndex + 1);
@@ -439,13 +435,7 @@ namespace Emby.Dlna.PlayTo
 
         private int _currentPlaylistIndex;
         private readonly List<PlaylistItem> _playlist = new List<PlaylistItem>();
-        private List<PlaylistItem> Playlist
+        private List<PlaylistItem> Playlist => _playlist;
-        {
-            get
-            {
-                return _playlist;
-            }
-        }
 
         private void AddItemFromId(Guid id, List<BaseItem> list)
         {
@@ -463,8 +453,7 @@ namespace Emby.Dlna.PlayTo
             var profile = _dlnaManager.GetProfile(deviceInfo.ToDeviceIdentification()) ??
                 _dlnaManager.GetDefaultProfile();
 
-            var hasMediaSources = item as IHasMediaSources;
+            var mediaSources = item is IHasMediaSources
-            var mediaSources = hasMediaSources != null
                 ? (_mediaSourceManager.GetStaticMediaSources(item, true, user))
                 : new List<MediaSourceInfo>();
 
@@ -473,7 +462,7 @@ namespace Emby.Dlna.PlayTo
 
             playlistItem.StreamUrl = DidlBuilder.NormalizeDlnaMediaUrl(playlistItem.StreamInfo.ToUrl(_serverAddress, _accessToken));
 
-            var itemXml = new DidlBuilder(profile, user, _imageProcessor, _serverAddress, _accessToken, _userDataManager, _localization, _mediaSourceManager, _logger, _libraryManager, _mediaEncoder)
+            var itemXml = new DidlBuilder(profile, user, _imageProcessor, _serverAddress, _accessToken, _userDataManager, _localization, _mediaSourceManager, _logger, _mediaEncoder)
                 .GetItemDidl(_config.GetDlnaConfiguration(), item, user, null, _session.DeviceId, new Filter(), playlistItem.StreamInfo);
 
             playlistItem.Didl = itemXml;
@@ -641,9 +630,7 @@ namespace Emby.Dlna.PlayTo
 
         private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            GeneralCommandType commandType;
+            if (Enum.TryParse(command.Name, true, out GeneralCommandType commandType))
-
-            if (Enum.TryParse(command.Name, true, out commandType))
             {
                 switch (commandType)
                 {
@@ -659,13 +646,9 @@ namespace Emby.Dlna.PlayTo
                         return _device.ToggleMute(cancellationToken);
                     case GeneralCommandType.SetAudioStreamIndex:
                         {
-                            string arg;
+                            if (command.Arguments.TryGetValue("Index", out string arg))
-
-                            if (command.Arguments.TryGetValue("Index", out arg))
                             {
-                                int val;
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var val))
-
-                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out val))
                                 {
                                     return SetAudioStreamIndex(val);
                                 }
@@ -677,13 +660,9 @@ namespace Emby.Dlna.PlayTo
                         }
                     case GeneralCommandType.SetSubtitleStreamIndex:
                         {
-                            string arg;
+                            if (command.Arguments.TryGetValue("Index", out string arg))
-
-                            if (command.Arguments.TryGetValue("Index", out arg))
                             {
-                                int val;
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var val))
-
-                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out val))
                                 {
                                     return SetSubtitleStreamIndex(val);
                                 }
@@ -695,13 +674,9 @@ namespace Emby.Dlna.PlayTo
                         }
                     case GeneralCommandType.SetVolume:
                         {
-                            string arg;
+                            if (command.Arguments.TryGetValue("Volume", out string arg))
-
-                            if (command.Arguments.TryGetValue("Volume", out arg))
                             {
-                                int volume;
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out var volume))
-
-                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out volume))
                                 {
                                     return _device.SetVolume(volume, cancellationToken);
                                 }
@@ -829,7 +804,7 @@ namespace Emby.Dlna.PlayTo
             {
                 if (string.IsNullOrEmpty(url))
                 {
-                    throw new ArgumentNullException("url");
+                    throw new ArgumentNullException(nameof(url));
                 }
 
                 var parts = url.Split('/');
@@ -855,7 +830,7 @@ namespace Emby.Dlna.PlayTo
             {
                 if (string.IsNullOrEmpty(url))
                 {
-                    throw new ArgumentNullException("url");
+                    throw new ArgumentNullException(nameof(url));
                 }
 
                 var request = new StreamParams
@@ -896,8 +871,7 @@ namespace Emby.Dlna.PlayTo
         {
             var value = values.Get(name);
 
-            int result;
+            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
-            if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
             {
                 return result;
             }
@@ -909,8 +883,7 @@ namespace Emby.Dlna.PlayTo
         {
             var value = values.Get(name);
 
-            long result;
+            if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var result))
-            if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out result))
             {
                 return result;
             }

Emby.Dlna/PlayTo/PlayToManager.cs

@@ -1,26 +1,22 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Session;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Threading;
+using MediaBrowser.Model.Session;
-using System.Threading;
+using Microsoft.Extensions.Logging;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Devices;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -42,13 +38,12 @@ namespace Emby.Dlna.PlayTo
         private readonly IDeviceDiscovery _deviceDiscovery;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IMediaEncoder _mediaEncoder;
-        private readonly ITimerFactory _timerFactory;
 
         private bool _disposed;
         private SemaphoreSlim _sessionLock = new SemaphoreSlim(1, 1);
         private CancellationTokenSource _disposeCancellationTokenSource = new CancellationTokenSource();
 
-        public PlayToManager(ILogger logger, ISessionManager sessionManager, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, IDeviceDiscovery deviceDiscovery, IHttpClient httpClient, IServerConfigurationManager config, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IMediaEncoder mediaEncoder, ITimerFactory timerFactory)
+        public PlayToManager(ILogger logger, ISessionManager sessionManager, ILibraryManager libraryManager, IUserManager userManager, IDlnaManager dlnaManager, IServerApplicationHost appHost, IImageProcessor imageProcessor, IDeviceDiscovery deviceDiscovery, IHttpClient httpClient, IServerConfigurationManager config, IUserDataManager userDataManager, ILocalizationManager localization, IMediaSourceManager mediaSourceManager, IMediaEncoder mediaEncoder)
         {
             _logger = logger;
             _sessionManager = sessionManager;
@@ -64,7 +59,6 @@ namespace Emby.Dlna.PlayTo
             _localization = localization;
             _mediaSourceManager = mediaSourceManager;
             _mediaEncoder = mediaEncoder;
-            _timerFactory = timerFactory;
         }
 
         public void Start()
@@ -81,11 +75,9 @@ namespace Emby.Dlna.PlayTo
 
             var info = e.Argument;
 
-            string usn;
+            if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty;
-            if (!info.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
 
-            string nt;
+            if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty;
-            if (!info.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
 
             string location = info.Location.ToString();
 
@@ -97,11 +89,6 @@ namespace Emby.Dlna.PlayTo
                 return;
             }
 
-            if (_sessionManager.Sessions.Any(i => usn.IndexOf(i.DeviceId, StringComparison.OrdinalIgnoreCase) != -1))
-            {
-                return;
-            }
-
             var cancellationToken = _disposeCancellationTokenSource.Token;
 
             await _sessionLock.WaitAsync(cancellationToken).ConfigureAwait(false);
@@ -113,6 +100,11 @@ namespace Emby.Dlna.PlayTo
                     return;
                 }
 
+                if (_sessionManager.Sessions.Any(i => usn.IndexOf(i.DeviceId, StringComparison.OrdinalIgnoreCase) != -1))
+                {
+                    return;
+                }
+
                 await AddDevice(info, location, cancellationToken).ConfigureAwait(false);
             }
             catch (OperationCanceledException)
@@ -158,8 +150,7 @@ namespace Emby.Dlna.PlayTo
             _logger.LogDebug("Attempting to create PlayToController from location {0}", location);
 
             _logger.LogDebug("Logging session activity from location {0}", location);
-            string uuid;
+            if (info.Headers.TryGetValue("USN", out string uuid))
-            if (info.Headers.TryGetValue("USN", out uuid))
             {
                 uuid = GetUuid(uuid);
             }
@@ -168,17 +159,15 @@ namespace Emby.Dlna.PlayTo
                 uuid = location.GetMD5().ToString("N");
             }
 
-            string deviceName = null;
+            var sessionInfo = _sessionManager.LogSessionActivity("DLNA", _appHost.ApplicationVersion, uuid, null, uri.OriginalString, null);
-
-            var sessionInfo = _sessionManager.LogSessionActivity("DLNA", _appHost.ApplicationVersion.ToString(), uuid, deviceName, uri.OriginalString, null);
 
             var controller = sessionInfo.SessionControllers.OfType<PlayToController>().FirstOrDefault();
 
             if (controller == null)
             {
-                var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger, _timerFactory, cancellationToken).ConfigureAwait(false);
+                var device = await Device.CreateuPnpDeviceAsync(uri, _httpClient, _config, _logger, cancellationToken).ConfigureAwait(false);
 
-                deviceName = device.Properties.Name;
+                string deviceName = device.Properties.Name;
 
                 _sessionManager.UpdateDeviceName(sessionInfo.Id, deviceName);
 
@@ -192,8 +181,6 @@ namespace Emby.Dlna.PlayTo
                     serverAddress = _appHost.GetLocalApiUrl(info.LocalIpAddress);
                 }
 
-                string accessToken = null;
-
                 controller = new PlayToController(sessionInfo,
                    _sessionManager,
                    _libraryManager,
@@ -202,7 +189,7 @@ namespace Emby.Dlna.PlayTo
                    _userManager,
                    _imageProcessor,
                    serverAddress,
-                   accessToken,
+                   null,
                    _deviceDiscovery,
                    _userDataManager,
                    _localization,

Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -6,4 +6,4 @@ namespace Emby.Dlna.PlayTo
     {
         public uBaseObject MediaInfo { get; set; }
     }
-}
+}

Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {

Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -12,4 +12,4 @@ namespace Emby.Dlna.PlayTo
         public uBaseObject OldMediaInfo { get; set; }
         public uBaseObject NewMediaInfo { get; set; }
     }
-}
+}

Emby.Dlna/PlayTo/PlaylistItem.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.PlayTo
 {
@@ -12,4 +12,4 @@ namespace Emby.Dlna.PlayTo
 
         public DeviceProfile Profile { get; set; }
     }
-}
+}