aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Streaming
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-02-23 02:57:11 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-02-23 02:57:11 -0500
commitb8d5c718429f1325111834b8b95698fc9c9ba47d (patch)
treef7f23b8704380552f25f3edfa3d706455069692e /MediaBrowser.Api/Streaming
parentc165f37bb96ad40d863a436795c21b9085f3fde9 (diff)
type discovery without attributes
Diffstat (limited to 'MediaBrowser.Api/Streaming')
-rw-r--r--MediaBrowser.Api/Streaming/AudioHandler.cs2
-rw-r--r--MediaBrowser.Api/Streaming/BaseStreamingHandler.cs10
-rw-r--r--MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs2
-rw-r--r--MediaBrowser.Api/Streaming/HlsSegmentHandler.cs2
-rw-r--r--MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs2
-rw-r--r--MediaBrowser.Api/Streaming/VideoHandler.cs8
6 files changed, 6 insertions, 20 deletions
diff --git a/MediaBrowser.Api/Streaming/AudioHandler.cs b/MediaBrowser.Api/Streaming/AudioHandler.cs
index b7d5afbb9a..2332f29d3f 100644
--- a/MediaBrowser.Api/Streaming/AudioHandler.cs
+++ b/MediaBrowser.Api/Streaming/AudioHandler.cs
@@ -5,7 +5,6 @@ using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Dto;
using System;
using System.Collections.Generic;
-using System.ComponentModel.Composition;
using System.Linq;
using System.Net;
@@ -14,7 +13,6 @@ namespace MediaBrowser.Api.Streaming
/// <summary>
/// Providers a progressive streaming audio api
/// </summary>
- [Export(typeof(IHttpServerHandler))]
public class AudioHandler : BaseProgressiveStreamingHandler<Audio>
{
/// <summary>
diff --git a/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs b/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs
index d800a40fee..8c5fd34b1d 100644
--- a/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs
+++ b/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs
@@ -859,11 +859,11 @@ namespace MediaBrowser.Api.Streaming
{
var video = LibraryItem as Video;
- if (video != null && video.VideoType == VideoType.Iso &&
- video.IsoType.HasValue && Kernel.IsoManager.CanMount(video.Path))
- {
- IsoMount = await Kernel.IsoManager.Mount(video.Path, CancellationToken.None).ConfigureAwait(false);
- }
+ //if (video != null && video.VideoType == VideoType.Iso &&
+ // video.IsoType.HasValue && Kernel.IsoManager.CanMount(video.Path))
+ //{
+ // IsoMount = await Kernel.IsoManager.Mount(video.Path, CancellationToken.None).ConfigureAwait(false);
+ //}
var process = new Process
{
diff --git a/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs b/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs
index 7aea163af6..e9ae3a0050 100644
--- a/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs
+++ b/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs
@@ -2,7 +2,6 @@
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Model.Dto;
using System;
-using System.ComponentModel.Composition;
using System.Net;
namespace MediaBrowser.Api.Streaming
@@ -10,7 +9,6 @@ namespace MediaBrowser.Api.Streaming
/// <summary>
/// Class HlsAudioPlaylistHandler
/// </summary>
- [Export(typeof(IHttpServerHandler))]
public class HlsAudioPlaylistHandler : BaseHlsPlaylistHandler<Audio>
{
/// <summary>
diff --git a/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs b/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs
index 5b022ab3d4..4305fd8a79 100644
--- a/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs
+++ b/MediaBrowser.Api/Streaming/HlsSegmentHandler.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
using System;
-using System.ComponentModel.Composition;
using System.IO;
using System.Net;
using System.Threading.Tasks;
@@ -11,7 +10,6 @@ namespace MediaBrowser.Api.Streaming
/// <summary>
/// Class HlsSegmentHandler
/// </summary>
- [Export(typeof(IHttpServerHandler))]
public class HlsSegmentHandler : BaseHandler<Kernel>
{
/// <summary>
diff --git a/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs b/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs
index 97a5b2ce63..70f825f02b 100644
--- a/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs
+++ b/MediaBrowser.Api/Streaming/HlsVideoPlaylistHandler.cs
@@ -1,7 +1,6 @@
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller.Entities;
using System;
-using System.ComponentModel.Composition;
using System.Net;
namespace MediaBrowser.Api.Streaming
@@ -9,7 +8,6 @@ namespace MediaBrowser.Api.Streaming
/// <summary>
/// Class HlsVideoPlaylistHandler
/// </summary>
- [Export(typeof(IHttpServerHandler))]
public class HlsVideoPlaylistHandler : BaseHlsPlaylistHandler<Video>
{
/// <summary>
diff --git a/MediaBrowser.Api/Streaming/VideoHandler.cs b/MediaBrowser.Api/Streaming/VideoHandler.cs
index 4a05d2547b..da60297f23 100644
--- a/MediaBrowser.Api/Streaming/VideoHandler.cs
+++ b/MediaBrowser.Api/Streaming/VideoHandler.cs
@@ -1,21 +1,15 @@
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.IO;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Resolvers;
using System;
-using System.ComponentModel.Composition;
using System.Linq;
using System.Net;
-using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.Streaming
{
/// <summary>
/// Providers a progressive streaming video api
/// </summary>
- [Export(typeof(IHttpServerHandler))]
class VideoHandler : BaseProgressiveStreamingHandler<Video>
{
/// <summary>