aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model.Portable
diff options
context:
space:
mode:
authorT. Adams <t.adams88@gmail.com>2015-04-03 11:04:25 -0700
committerT. Adams <t.adams88@gmail.com>2015-04-03 11:04:25 -0700
commitabf12569ba2aa31ea3a00e4faf3adad2f740cbd9 (patch)
tree47c57c6361825491d38e3def6b716926ddd9aa59 /MediaBrowser.Model.Portable
parent46c92107490263f8e6abefbd2259780013fa195d (diff)
parentef505c8e9e2b8f348aeaa89be6bc446014b72996 (diff)
Merging in latest dev
Diffstat (limited to 'MediaBrowser.Model.Portable')
-rw-r--r--MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj16
1 files changed, 14 insertions, 2 deletions
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index c2d46b9b3f..fdedc51a21 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -413,6 +413,9 @@
<Compile Include="..\MediaBrowser.Model\Dlna\StreamInfo.cs">
<Link>Dlna\StreamInfo.cs</Link>
</Compile>
+ <Compile Include="..\MediaBrowser.Model\Dlna\StreamInfoSorter.cs">
+ <Link>Dlna\StreamInfoSorter.cs</Link>
+ </Compile>
<Compile Include="..\MediaBrowser.Model\Dlna\SubtitleDeliveryMethod.cs">
<Link>Dlna\SubtitleDeliveryMethod.cs</Link>
</Compile>
@@ -800,12 +803,21 @@
<Compile Include="..\MediaBrowser.Model\MediaInfo\IBlurayExaminer.cs">
<Link>MediaInfo\IBlurayExaminer.cs</Link>
</Compile>
- <Compile Include="..\MediaBrowser.Model\MediaInfo\LiveMediaInfoResult.cs">
- <Link>MediaInfo\LiveMediaInfoResult.cs</Link>
+ <Compile Include="..\MediaBrowser.Model\MediaInfo\LiveStreamRequest.cs">
+ <Link>MediaInfo\LiveStreamRequest.cs</Link>
+ </Compile>
+ <Compile Include="..\MediaBrowser.Model\MediaInfo\LiveStreamResponse.cs">
+ <Link>MediaInfo\LiveStreamResponse.cs</Link>
</Compile>
<Compile Include="..\MediaBrowser.Model\MediaInfo\MediaProtocol.cs">
<Link>MediaInfo\MediaProtocol.cs</Link>
</Compile>
+ <Compile Include="..\MediaBrowser.Model\MediaInfo\PlaybackInfoRequest.cs">
+ <Link>MediaInfo\PlaybackInfoRequest.cs</Link>
+ </Compile>
+ <Compile Include="..\MediaBrowser.Model\MediaInfo\PlaybackInfoResponse.cs">
+ <Link>MediaInfo\PlaybackInfoResponse.cs</Link>
+ </Compile>
<Compile Include="..\MediaBrowser.Model\MediaInfo\SubtitleFormat.cs">
<Link>MediaInfo\SubtitleFormat.cs</Link>
</Compile>