From a8e4e1ae90b0f801b3fdea7d3270a6adee59b2a3 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sat, 21 Nov 2020 16:12:47 -0400 Subject: [PATCH 1/3] #183 Enable 10 and 15 seconds breaks in Add Breaks. fix issue where the 30 seconds option was actually the same as the 20 seconds option... --- web/directives/channel-config.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index 0a53965..684fe20 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -1247,6 +1247,8 @@ module.exports = function ($timeout, $location, dizquetv) { 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" }, @@ -1255,8 +1257,9 @@ module.exports = function ($timeout, $location, dizquetv) { { 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" }, From f878125320fc13698c980224b32f1dcffffd3b03 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sat, 21 Nov 2020 17:45:04 -0400 Subject: [PATCH 2/3] #171 Do not require Plex connection to play videos when direct paths are enabled. --- src/plexTranscoder.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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`; From fdeff289797450232b24682b17b6c598e452c0f9 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sat, 21 Nov 2020 17:59:19 -0400 Subject: [PATCH 3/3] Set discord link to #rules channel instead of #new-features --- web/public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - +