From b35dcbb9f02c27d2d84ee3281a60d654a3fb1259 Mon Sep 17 00:00:00 2001
From: cvium <clausvium@gmail.com>
Date: Wed, 16 Jan 2019 20:50:40 +0100
Subject: Remove MediaBrowser.Text since it violates licenses and is overall
 hacky

---
 BDInfo/TSStreamClipFile.cs | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'BDInfo/TSStreamClipFile.cs')

diff --git a/BDInfo/TSStreamClipFile.cs b/BDInfo/TSStreamClipFile.cs
index be6299e1a8..3396f4c719 100644
--- a/BDInfo/TSStreamClipFile.cs
+++ b/BDInfo/TSStreamClipFile.cs
@@ -1,4 +1,4 @@
-//============================================================================
+//============================================================================
 // BDInfo - Blu-ray Video and Audio Analysis Tool
 // Copyright © 2010 Cinema Squid
 //
@@ -21,15 +21,14 @@
 using System;
 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;
@@ -38,12 +37,10 @@ namespace BDInfo
         public Dictionary<ushort, TSStream> Streams =
             new Dictionary<ushort, TSStream>();
 
-        public TSStreamClipFile(
-            FileSystemMetadata fileInfo, IFileSystem fileSystem, ITextEncoding textEncoding)
+        public TSStreamClipFile(FileSystemMetadata fileInfo, IFileSystem fileSystem)
         {
             FileInfo = fileInfo;
             _fileSystem = fileSystem;
-            _textEncoding = textEncoding;
             Name = fileInfo.Name.ToUpper();
         }
 
@@ -69,7 +66,7 @@ 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")
                 {
@@ -165,8 +162,7 @@ namespace BDInfo
                                 byte[] languageBytes = new byte[3];
                                 Array.Copy(clipData, streamOffset + 3,
                                     languageBytes, 0, languageBytes.Length);
-                                string languageCode =
-                                    _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
 
                                 var channelLayout = (TSChannelLayout)
                                     (clipData[streamOffset + 2] >> 4);
@@ -196,8 +192,7 @@ namespace BDInfo
                                 byte[] languageBytes = new byte[3];
                                 Array.Copy(clipData, streamOffset + 2,
                                     languageBytes, 0, languageBytes.Length);
-                                string languageCode =
-                                    _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
 
                                 stream = new TSGraphicsStream();
                                 stream.LanguageCode = languageCode;
@@ -216,8 +211,7 @@ namespace BDInfo
                                 byte[] languageBytes = new byte[3];
                                 Array.Copy(clipData, streamOffset + 3,
                                     languageBytes, 0, languageBytes.Length);
-                                string languageCode =
-                                    _textEncoding.GetASCIIEncoding().GetString(languageBytes, 0, languageBytes.Length);
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
 #if DEBUG
                             Debug.WriteLine(string.Format(
                                 "\t{0} {1} {2}",
-- 
cgit v1.2.3