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

update live tv scrolling

Browse Source
This commit is contained in:
Luke Pulverenti 2015-06-07 21:23:56 -04:00
parent cfb42b48a9
commit fa62f163c6
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -782,9 +782,19 @@ namespace MediaBrowser.Api.Playback.Hls
protected override string GetAudioArguments(StreamState state) protected override string GetAudioArguments(StreamState state)
{ {
var codec = GetAudioEncoder(state.Request);
if (!state.IsOutputVideo) if (!state.IsOutputVideo)
{ {
if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
{
return "-acodec copy";
}
var audioTranscodeParams = new List<string>(); var audioTranscodeParams = new List<string>();
audioTranscodeParams.Add("-acodec " + codec);
if (state.OutputAudioBitrate.HasValue) if (state.OutputAudioBitrate.HasValue)
{ {
audioTranscodeParams.Add("-ab " + state.OutputAudioBitrate.Value.ToString(UsCulture)); audioTranscodeParams.Add("-ab " + state.OutputAudioBitrate.Value.ToString(UsCulture));
@ -804,8 +814,6 @@ namespace MediaBrowser.Api.Playback.Hls
return string.Join(" ", audioTranscodeParams.ToArray()); return string.Join(" ", audioTranscodeParams.ToArray());
} }
var codec = GetAudioEncoder(state.Request);
if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase)) if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase))
{ {
return "-codec:a:0 copy"; return "-codec:a:0 copy";

16
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -552,13 +552,11 @@ namespace MediaBrowser.WebDashboard.Api
"appservices.js", "appservices.js",
"playlistmanager.js", "playlistmanager.js",
"appsettings.js", "appsettings.js",
"mediaplayer.js", "mediaplayer.js",
"mediaplayer-video.js", "mediaplayer-video.js",
"nowplayingbar.js", "nowplayingbar.js",
"nowplayingpage.js", "nowplayingpage.js",
"taskbutton.js", "taskbutton.js",
"alphapicker.js", "alphapicker.js",
"addpluginpage.js", "addpluginpage.js",
"autoorganizetv.js", "autoorganizetv.js",
@ -568,47 +566,33 @@ namespace MediaBrowser.WebDashboard.Api
"dashboardpage.js", "dashboardpage.js",
"devicesupload.js", "devicesupload.js",
"directorybrowser.js", "directorybrowser.js",
"dlnaprofile.js",
"dlnaprofiles.js",
"dlnasettings.js",
"dlnaserversettings.js",
"editcollectionitems.js", "editcollectionitems.js",
"edititemmetadata.js", "edititemmetadata.js",
"edititemsubtitles.js", "edititemsubtitles.js",
"playbackconfiguration.js", "playbackconfiguration.js",
"cinemamodeconfiguration.js", "cinemamodeconfiguration.js",
"encodingsettings.js",
"forgotpassword.js", "forgotpassword.js",
"forgotpasswordpin.js", "forgotpasswordpin.js",
"indexpage.js", "indexpage.js",
"itembynamedetailpage.js", "itembynamedetailpage.js",
"itemdetailpage.js", "itemdetailpage.js",
"librarypathmapping.js", "librarypathmapping.js",
"librarysettings.js",
"livetvrecording.js", "livetvrecording.js",
"livetvtimer.js", "livetvtimer.js",
"livetvseriestimer.js", "livetvseriestimer.js",
"medialibrarypage.js", "medialibrarypage.js",
"metadataconfigurationpage.js", "metadataconfigurationpage.js",
"metadataimagespage.js", "metadataimagespage.js",
"metadatasubtitles.js", "metadatasubtitles.js",
"metadatanfo.js",
"moviecollections.js", "moviecollections.js",
"notifications.js", "notifications.js",
"notificationsetting.js", "notificationsetting.js",
"notificationsettings.js", "notificationsettings.js",
"playlists.js", "playlists.js",
"playlistedit.js", "playlistedit.js",
"plugincatalogpage.js", "plugincatalogpage.js",
"pluginspage.js", "pluginspage.js",
"remotecontrol.js", "remotecontrol.js",
"scheduledtaskpage.js",
"scheduledtaskspage.js",
"search.js", "search.js",
"syncactivity.js", "syncactivity.js",
"thememediaplayer.js", "thememediaplayer.js",