Browse Source

update live tv scrolling

Luke Pulverenti 10 years ago
parent
commit
fa62f163c6

+ 10 - 2
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";

+ 0 - 16
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",