From c93740461e5cef99deb378e587b75cf74950b94e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 2 Jan 2015 00:36:27 -0500
Subject: support audio sync transcoding

---
 MediaBrowser.Model/Dlna/StreamBuilder.cs | 6 ++++--
 MediaBrowser.Model/Dlna/StreamInfo.cs    | 1 +
 MediaBrowser.Model/Sync/LocalItem.cs     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 208ea14209..7c47b0d444 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -109,7 +109,8 @@ namespace MediaBrowser.Model.Dlna
                 ItemId = options.ItemId,
                 MediaType = DlnaProfileType.Audio,
                 MediaSource = item,
-                RunTimeTicks = item.RunTimeTicks
+                RunTimeTicks = item.RunTimeTicks,
+                Context = options.Context
             };
 
             int? maxBitrateSetting = options.GetMaxBitrate();
@@ -240,7 +241,8 @@ namespace MediaBrowser.Model.Dlna
                 ItemId = options.ItemId,
                 MediaType = DlnaProfileType.Video,
                 MediaSource = item,
-                RunTimeTicks = item.RunTimeTicks
+                RunTimeTicks = item.RunTimeTicks,
+                Context = options.Context
             };
 
             int? audioStreamIndex = options.AudioStreamIndex ?? item.DefaultAudioStreamIndex;
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 703c735666..22eb0cf6ce 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -18,6 +18,7 @@ namespace MediaBrowser.Model.Dlna
         public string ItemId { get; set; }
 
         public PlayMethod PlayMethod { get; set; }
+        public EncodingContext Context { get; set; }
 
         public DlnaProfileType MediaType { get; set; }
 
diff --git a/MediaBrowser.Model/Sync/LocalItem.cs b/MediaBrowser.Model/Sync/LocalItem.cs
index 51faaff904..ec4544524a 100644
--- a/MediaBrowser.Model/Sync/LocalItem.cs
+++ b/MediaBrowser.Model/Sync/LocalItem.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Model.Sync
         /// Gets or sets the unique identifier.
         /// </summary>
         /// <value>The unique identifier.</value>
-        public string UniqueId { get; set; }
+        public string Id { get; set; }
         /// <summary>
         /// Gets or sets the item identifier.
         /// </summary>
-- 
cgit v1.2.3