Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes #528 - Support podcasts in web client

Browse Source
This commit is contained in:
Luke Pulverenti 2013-09-30 14:49:19 -04:00
parent 2aea480225
commit e5d026c483
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -470,12 +470,15 @@ namespace MediaBrowser.Api.Playback
/// <returns>System.Nullable{System.Int32}.</returns> /// <returns>System.Nullable{System.Int32}.</returns>
protected int? GetNumAudioChannelsParam(StreamRequest request, MediaStream audioStream) protected int? GetNumAudioChannelsParam(StreamRequest request, MediaStream audioStream)
{ {
if (audioStream.Channels > 2 && request.AudioCodec.HasValue) if (audioStream != null)
{ {
if (request.AudioCodec.Value == AudioCodecs.Wma) if (audioStream.Channels > 2 && request.AudioCodec.HasValue)
{ {
// wmav2 currently only supports two channel output if (request.AudioCodec.Value == AudioCodecs.Wma)
return 2; {
// wmav2 currently only supports two channel output
return 2;
}
} }
} }

4
MediaBrowser.Api/Playback/Progressive/AudioService.cs
View File

@ -6,9 +6,7 @@ using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Persistence;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using ServiceStack.ServiceHost; using ServiceStack.ServiceHost;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
namespace MediaBrowser.Api.Playback.Progressive namespace MediaBrowser.Api.Playback.Progressive
{ {
@ -94,7 +92,7 @@ namespace MediaBrowser.Api.Playback.Progressive
{ {
audioTranscodeParams.Add("-ac " + channels.Value); audioTranscodeParams.Add("-ac " + channels.Value);
} }
if (request.AudioSampleRate.HasValue) if (request.AudioSampleRate.HasValue)
{ {
audioTranscodeParams.Add("-ar " + request.AudioSampleRate.Value); audioTranscodeParams.Add("-ar " + request.AudioSampleRate.Value);