aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Channels
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-16 21:56:23 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-06-16 21:56:23 -0400
commit21fd761b05584481d9f6293ca48e373f356c80b6 (patch)
tree47f8c0a461e6a99bd75f588792cb0f865ad56ee4 /MediaBrowser.Controller/Channels
parentf91889e3c465edc3ca2c8079429e17646ef1c440 (diff)
fixes #838 - Support rtmp protocol with channels
Diffstat (limited to 'MediaBrowser.Controller/Channels')
-rw-r--r--MediaBrowser.Controller/Channels/ChannelMediaInfo.cs11
1 files changed, 7 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
index 2e2f1912a1..e8369f5738 100644
--- a/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelMediaInfo.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.MediaInfo;
+using System;
using System.Collections.Generic;
namespace MediaBrowser.Controller.Channels
@@ -20,16 +21,18 @@ namespace MediaBrowser.Controller.Channels
public int? AudioChannels { get; set; }
public int? AudioSampleRate { get; set; }
- public bool IsRemote { get; set; }
-
public string VideoProfile { get; set; }
public float? VideoLevel { get; set; }
public float? Framerate { get; set; }
+ public MediaProtocol Protocol { get; set; }
+
public ChannelMediaInfo()
{
RequiredHttpHeaders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
- IsRemote = true;
+
+ // This is most common
+ Protocol = MediaProtocol.Http;
}
}
} \ No newline at end of file