diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-06-07 21:23:56 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-06-07 21:23:56 -0400 |
| commit | fa62f163c6e9c51c49343521818af1b50fe4f0c7 (patch) | |
| tree | b11566a9ad264731babe2dcc211a7b430f25da3a | |
| parent | cfb42b48a99192692f06ec5a97ec106ce15cc62b (diff) | |
update live tv scrolling
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Api/PackageCreator.cs | 16 |
2 files changed, 10 insertions, 18 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index 5cbd6d4949..ccbf182fe9 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -782,9 +782,19 @@ namespace MediaBrowser.Api.Playback.Hls protected override string GetAudioArguments(StreamState state) { + var codec = GetAudioEncoder(state.Request); + if (!state.IsOutputVideo) { + if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase)) + { + return "-acodec copy"; + } + var audioTranscodeParams = new List<string>(); + + audioTranscodeParams.Add("-acodec " + codec); + if (state.OutputAudioBitrate.HasValue) { audioTranscodeParams.Add("-ab " + state.OutputAudioBitrate.Value.ToString(UsCulture)); @@ -804,8 +814,6 @@ namespace MediaBrowser.Api.Playback.Hls return string.Join(" ", audioTranscodeParams.ToArray()); } - var codec = GetAudioEncoder(state.Request); - if (string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase)) { return "-codec:a:0 copy"; diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 67f84d8b99..0534ffe5f9 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -552,13 +552,11 @@ namespace MediaBrowser.WebDashboard.Api "appservices.js", "playlistmanager.js", "appsettings.js", - "mediaplayer.js", "mediaplayer-video.js", "nowplayingbar.js", "nowplayingpage.js", "taskbutton.js", - "alphapicker.js", "addpluginpage.js", "autoorganizetv.js", @@ -568,47 +566,33 @@ namespace MediaBrowser.WebDashboard.Api "dashboardpage.js", "devicesupload.js", "directorybrowser.js", - "dlnaprofile.js", - "dlnaprofiles.js", - "dlnasettings.js", - "dlnaserversettings.js", "editcollectionitems.js", "edititemmetadata.js", "edititemsubtitles.js", - "playbackconfiguration.js", "cinemamodeconfiguration.js", - "encodingsettings.js", - "forgotpassword.js", "forgotpasswordpin.js", "indexpage.js", "itembynamedetailpage.js", "itemdetailpage.js", "librarypathmapping.js", - "librarysettings.js", "livetvrecording.js", "livetvtimer.js", "livetvseriestimer.js", - "medialibrarypage.js", "metadataconfigurationpage.js", "metadataimagespage.js", "metadatasubtitles.js", - "metadatanfo.js", "moviecollections.js", - "notifications.js", "notificationsetting.js", "notificationsettings.js", "playlists.js", "playlistedit.js", - "plugincatalogpage.js", "pluginspage.js", "remotecontrol.js", - "scheduledtaskpage.js", - "scheduledtaskspage.js", "search.js", "syncactivity.js", "thememediaplayer.js", |