diff --git a/src/plexTranscoder.js b/src/plexTranscoder.js index ee1a79a..00663a1 100644 --- a/src/plexTranscoder.js +++ b/src/plexTranscoder.js @@ -289,7 +289,11 @@ lang=en` } - async getDecision(directPlay) { + async getDecisionUnmanaged(directPlay) { + if (this.settings.streamPath === 'direct') { + console.log("Skip get transcode decision because direct path is enabled"); + return; + } let res = await axios.get(`${this.server.uri}/video/:/transcode/universal/decision?${this.transcodingArgs}`, { headers: { Accept: 'application/json' } }) @@ -307,6 +311,14 @@ lang=en` } } + async getDecision(directPlay) { + try { + this.getDecisionUnmanaged(directPlay); + } catch (err) { + console.error(err); + } + } + getStatusUrl() { let profileName=`Generic`; diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index 4bddfeb..db440b4 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -1423,6 +1423,8 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) { scope.minBreakSize = -1; scope.maxBreakSize = -1; let breakSizeOptions = [ + { id: 10, description: "10 seconds" }, + { id: 15, description: "15 seconds" }, { id: 30, description: "30 seconds" }, { id: 45, description: "45 seconds" }, { id: 60, description: "60 seconds" }, @@ -1431,8 +1433,9 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions) { { id: 180, description: "3 minutes" }, { id: 300, description: "5 minutes" }, { id: 450, description: "7.5 minutes" }, - { id: 600, description: "10 minutes" }, - { id: 1200, description: "20 minutes" }, + { id: 10*60, description: "10 minutes" }, + { id: 20*60, description: "20 minutes" }, + { id: 30*60, description: "30 minutes" }, ] scope.minBreakSizeOptions = [ { id: -1, description: "Min Duration" }, diff --git a/web/public/index.html b/web/public/index.html index c701ec2..a495695 100644 --- a/web/public/index.html +++ b/web/public/index.html @@ -25,7 +25,7 @@ - +