Merge pull request #3345 from MediaBrowser/dev

Dev
MediaBrowser · Jun 29, 2018 · b685f7b · b685f7b
2 parents 1f3ef76 + 40231d1
commit b685f7b
Show file tree

Hide file tree

Showing 104 changed files with 773 additions and 704 deletions.
diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
@@ -34,10 +34,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/BDInfo/packages.config b/BDInfo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
 </packages>
diff --git a/DvdLib/DvdLib.csproj b/DvdLib/DvdLib.csproj
@@ -49,10 +49,10 @@
     <Compile Include="Ifo\VideoAttributes.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/DvdLib/packages.config b/DvdLib/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -981,7 +981,7 @@ private void AddCover(BaseItem item, BaseItem context, StubType? stubType, XmlWr
 
             AddImageResElement(item, writer, 160, 160, "jpg", "JPEG_TN");
 
-            if (!_profile.EnableSingleAlbumArtLimit)
+            if (!_profile.EnableSingleAlbumArtLimit || string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase))
             {
                 AddImageResElement(item, writer, 4096, 4096, "jpg", "JPEG_LRG");
                 AddImageResElement(item, writer, 1024, 768, "jpg", "JPEG_MED");
@@ -1208,6 +1208,9 @@ private ImageUrlInfo GetImageUrl(ImageDownloadInfo info, int maxWidth, int maxHe
                 }
             }
 
+            // just lie
+            info.IsDirectStream = true;
+
             return new ImageUrlInfo
             {
                 Url = url,

diff --git a/Emby.Dlna/Emby.Dlna.csproj b/Emby.Dlna/Emby.Dlna.csproj
@@ -174,13 +174,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Emby.Dlna/Eventing/EventManager.cs b/Emby.Dlna/Eventing/EventManager.cs
@@ -85,7 +85,7 @@ public EventSubscriptionResponse CreateEventSubscription(string notificationType
 
                 int val;
 
-                if (int.TryParse(header, NumberStyles.Any, _usCulture, out val))
+                if (int.TryParse(header, NumberStyles.Integer, _usCulture, out val))
                 {
                     return val;
                 }

diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
@@ -175,6 +175,11 @@ private void RestartTimerInactive()
             }
         }
 
+        public void OnPlaybackStartedExternally()
+        {
+            RestartTimer(true);
+        }
+
         #region Commanding
 
         public Task VolumeDown(CancellationToken cancellationToken)
@@ -1020,8 +1025,8 @@ private static DeviceIcon CreateIcon(XElement element)
             var depth = element.GetDescendantValue(uPnpNamespaces.ud.GetName("depth"));
             var url = element.GetDescendantValue(uPnpNamespaces.ud.GetName("url"));
 
-            var widthValue = int.Parse(width, NumberStyles.Any, UsCulture);
-            var heightValue = int.Parse(height, NumberStyles.Any, UsCulture);
+            var widthValue = int.Parse(width, NumberStyles.Integer, UsCulture);
+            var heightValue = int.Parse(height, NumberStyles.Integer, UsCulture);
 
             return new DeviceIcon
             {

diff --git a/Emby.Dlna/PlayTo/PlayToController.cs b/Emby.Dlna/PlayTo/PlayToController.cs
@@ -675,7 +675,7 @@ private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancel
                             {
                                 int val;
 
-                                if (Int32.TryParse(arg, NumberStyles.Any, _usCulture, out val))
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out val))
                                 {
                                     return SetAudioStreamIndex(val);
                                 }
@@ -693,7 +693,7 @@ private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancel
                             {
                                 int val;
 
-                                if (Int32.TryParse(arg, NumberStyles.Any, _usCulture, out val))
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out val))
                                 {
                                     return SetSubtitleStreamIndex(val);
                                 }
@@ -711,7 +711,7 @@ private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancel
                             {
                                 int volume;
 
-                                if (Int32.TryParse(arg, NumberStyles.Any, _usCulture, out volume))
+                                if (int.TryParse(arg, NumberStyles.Integer, _usCulture, out volume))
                                 {
                                     return _device.SetVolume(volume, cancellationToken);
                                 }

diff --git a/Emby.Dlna/Profiles/Xml/Denon AVR.xml b/Emby.Dlna/Profiles/Xml/Denon AVR.xml
@@ -41,7 +41,14 @@
     <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
   </TranscodingProfiles>
   <ContainerProfiles />
-  <CodecProfiles />
+  <CodecProfiles>
+    <CodecProfile type="Audio" container="flac">
+      <Conditions>
+        <ProfileCondition condition="LessThanEqual" property="AudioSampleRate" value="96000" isRequired="true" />
+      </Conditions>
+      <ApplyConditions />
+    </CodecProfile>
+  </CodecProfiles>
   <ResponseProfiles />
   <SubtitleProfiles>
     <SubtitleProfile format="srt" method="External" />

diff --git a/Emby.Dlna/packages.config b/Emby.Dlna/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.1" targetFramework="net47" />
 </packages>
diff --git a/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj b/Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
@@ -35,13 +35,13 @@
       <HintPath>..\packages\ImageMagickSharp.1.0.0.19\lib\net45\ImageMagickSharp.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/Emby.Drawing.ImageMagick/packages.config b/Emby.Drawing.ImageMagick/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ImageMagickSharp" version="1.0.0.19" targetFramework="net452" />
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -43,13 +43,13 @@
     <Compile Include="StripCollageBuilder.cs" />
     <Compile Include="UnplayedCountIndicator.cs" />
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Emby.Drawing.Skia/packages.config b/Emby.Drawing.Skia/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
   <package id="SkiaSharp" version="1.58.1" targetFramework="portable45-net45+win8" requireReinstallation="true" />
 </packages>
diff --git a/Emby.Drawing/Emby.Drawing.csproj b/Emby.Drawing/Emby.Drawing.csproj
@@ -41,13 +41,13 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/Emby.Drawing/packages.config b/Emby.Drawing/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
@@ -32,13 +32,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="TagLib.Portable">
       <HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

diff --git a/Emby.Photos/packages.config b/Emby.Photos/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.Common" version="3.3.56-beta" targetFramework="net47" />
-  <package id="MediaBrowser.Server.Core" version="3.3.56-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Common" version="3.3.59-beta" targetFramework="net47" />
+  <package id="MediaBrowser.Server.Core" version="3.3.59-beta" targetFramework="net47" />
 </packages>
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -602,7 +602,7 @@
       <Name>Mono.Nat</Name>
     </ProjectReference>
     <Reference Include="Emby.Naming, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Naming.1.1.6-beta\lib\netstandard2.0\Emby.Naming.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Naming.1.1.7-beta\lib\netstandard2.0\Emby.Naming.dll</HintPath>
     </Reference>
     <Reference Include="Emby.Server.MediaEncoding">
       <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
@@ -611,21 +611,21 @@
       <HintPath>..\packages\Emby.XmlTv.1.0.14\lib\portable-net45+netstandard2.0+win8\Emby.XmlTv.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Common.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Controller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Server.Core.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Controller.dll</HintPath>
     </Reference>
     <Reference Include="MediaBrowser.Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Common.3.3.56-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
+      <HintPath>..\packages\MediaBrowser.Common.3.3.59-beta\lib\netstandard2.0\MediaBrowser.Model.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="PlaylistsNET, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\PlaylistsNET.1.0.0\lib\netstandard1.4\PlaylistsNET.dll</HintPath>
+    <Reference Include="PlaylistsNET, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\PlaylistsNET.1.0.1\lib\netstandard1.4\PlaylistsNET.dll</HintPath>
     </Reference>
     <Reference Include="ServiceStack.Text, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
       <HintPath>..\packages\ServiceStack.Text.5.1.0\lib\net45\ServiceStack.Text.dll</HintPath>

diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -52,7 +52,7 @@ public class LibraryChangedNotifier : IServerEntryPoint
         /// <summary>
         /// The library update duration
         /// </summary>
-        private const int LibraryUpdateDuration = 5000;
+        private const int LibraryUpdateDuration = 30000;
 
         private readonly IProviderManager _providerManager;
 

diff --git a/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs b/Emby.Server.Implementations/Library/ExclusiveLiveStream.cs
@@ -26,7 +26,7 @@ public class ExclusiveLiveStream : ILiveStream
         public bool EnableStreamSharing { get; set; }
         public MediaSourceInfo MediaSource { get; set; }
 
-        public string UniqueId => throw new NotImplementedException();
+        public string UniqueId { get; private set; }
 
         private ILiveTvService _liveTvService;
         private string _openedId;
@@ -37,11 +37,20 @@ public ExclusiveLiveStream(MediaSourceInfo mediaSource, ILiveTvService liveTvSer
             EnableStreamSharing = false;
             _liveTvService = liveTvService;
             _openedId = openedId;
+            ConsumerCount = 1;
+            UniqueId = Guid.NewGuid().ToString("N");
         }
 
         public Task Close()
         {
-            return _liveTvService.CloseLiveStream(_openedId, CancellationToken.None);
+            try
+            {
+                return _liveTvService.CloseLiveStream(_openedId, CancellationToken.None);
+            }
+            catch (NotImplementedException)
+            {
+                return Task.CompletedTask;
+            }
         }
 
         public Task Open(CancellationToken openCancellationToken)