6 files changed, 29 insertions, 25 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index d4ca379c03..665da030d4 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -423,7 +423,24 @@ namespace MediaBrowser.Model.Dlna
                 playlistItem.Container = transcodingProfile.Container;
                 playlistItem.EstimateContentLength = transcodingProfile.EstimateContentLength;
                 playlistItem.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
-                playlistItem.AudioCodec = transcodingProfile.AudioCodec.Split(',')[0];
+
+                // TODO: We should probably preserve the full list and sent it tp the server that way
+                string[] supportedAudioCodecs = transcodingProfile.AudioCodec.Split(',');
+                string inputAudioCodec = audioStream == null ? null : audioStream.Codec;
+                foreach (string supportedAudioCodec in supportedAudioCodecs)
+                {
+                    if (StringHelper.EqualsIgnoreCase(supportedAudioCodec, inputAudioCodec))
+                    {
+                        playlistItem.AudioCodec = supportedAudioCodec;
+                        break;
+                    }
+                }
+
+                if (string.IsNullOrEmpty(playlistItem.AudioCodec))
+                {
+                    playlistItem.AudioCodec = supportedAudioCodecs[0];
+                }
+
                 playlistItem.VideoCodec = transcodingProfile.VideoCodec;
                 playlistItem.CopyTimestamps = transcodingProfile.CopyTimestamps;
                 playlistItem.SubProtocol = transcodingProfile.Protocol;
@@ -761,7 +778,7 @@ namespace MediaBrowser.Model.Dlna
             // Look for an external profile that matches the stream type (text/graphical)
             foreach (SubtitleProfile profile in subtitleProfiles)
             {
-                if (profile.Method != SubtitleDeliveryMethod.External)
+                if (profile.Method != SubtitleDeliveryMethod.External && profile.Method != SubtitleDeliveryMethod.Hls)
                 {
                     continue;
                 }
@@ -771,7 +788,8 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if (subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
+                if ((profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) ||
+                    (profile.Method == SubtitleDeliveryMethod.Hls && subtitleStream.IsTextSubtitleStream))
                 {
                     bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
 
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 79ee1b5c58..69733cefbc 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -234,7 +234,8 @@ namespace MediaBrowser.Model.Dlna
             }
 
             list.Add(new NameValuePair("CopyTimestamps", (item.CopyTimestamps).ToString().ToLower()));
-            
+            list.Add(new NameValuePair("SubtitleMethod", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleDeliveryMethod.ToString() : string.Empty));
+       
             return list;
         }
 
diff --git a/MediaBrowser.Model/FodyWeavers.xml b/MediaBrowser.Model/FodyWeavers.xml
deleted file mode 100644
index 7369928101..0000000000
--- a/MediaBrowser.Model/FodyWeavers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers>
-  <PropertyChanged />
-</Weavers>
-\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index fda2402496..2500a27a82 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -14,6 +14,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ReleaseVersion>
     </ReleaseVersion>
+    <NuGetPackageImportStamp>60e95275</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -441,7 +442,6 @@
     <Compile Include="Users\UserAction.cs" />
     <Compile Include="Users\UserActionType.cs" />
     <Compile Include="Users\UserPolicy.cs" />
-    <None Include="FodyWeavers.xml" />
     <None Include="MediaBrowser.Model.snk" />
   </ItemGroup>
   <ItemGroup>
@@ -458,13 +458,6 @@
   <PropertyGroup>
     <PostBuildEvent />
   </PropertyGroup>
-  <Import Project="..\packages\Fody.1.29.2\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Fody.1.29.2\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.2\build\dotnet\Fody.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.Model/Session/PlaybackStopInfo.cs b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
index 80d719f037..3b4ac36a74 100644
--- a/MediaBrowser.Model/Session/PlaybackStopInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
@@ -12,25 +12,21 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The item.</value>
         public BaseItemInfo Item { get; set; }
-
         /// <summary>
         /// Gets or sets the item identifier.
         /// </summary>
         /// <value>The item identifier.</value>
         public string ItemId { get; set; }
-        
         /// <summary>
         /// Gets or sets the session id.
         /// </summary>
         /// <value>The session id.</value>
         public string SessionId { get; set; }
-
         /// <summary>
         /// Gets or sets the media version identifier.
         /// </summary>
         /// <value>The media version identifier.</value>
         public string MediaSourceId { get; set; }
-
         /// <summary>
         /// Gets or sets the position ticks.
         /// </summary>
@@ -46,5 +42,10 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The play session identifier.</value>
         public string PlaySessionId { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="PlaybackStopInfo"/> is failed.
+        /// </summary>
+        /// <value><c>true</c> if failed; otherwise, <c>false</c>.</value>
+        public bool Failed { get; set; }
     }
 }
 \ No newline at end of file
diff --git a/MediaBrowser.Model/packages.config b/MediaBrowser.Model/packages.config
deleted file mode 100644
index df2ddcf0f6..0000000000
--- a/MediaBrowser.Model/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Fody" version="1.29.2" targetFramework="net45" developmentDependency="true" />
-  <package id="PropertyChanged.Fody" version="1.50.4" targetFramework="net45" developmentDependency="true" />
-</packages>
-\ No newline at end of file