From ae41998d7cbe1730dab8e53c0f01eebf62cbebfe Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 29 Jan 2021 09:53:11 -0500 Subject: [PATCH] Add a check for passthrough and not ffmpeg --- web/lang/en_gb.php | 1 + web/skins/classic/views/js/monitor.js.php | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index 02456ddb5..0525dea04 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -175,6 +175,7 @@ $SLANG = array( 'BadNameChars' => 'Names may only contain alphanumeric characters plus spaces, hyphen and underscore', 'BadPalette' => 'Palette must be set to a valid value', 'BadColours' => 'Target colour must be set to a valid value', + 'BadPassthrough' => 'Passthrough only works with ffmpeg type monitors.', 'BadPath' => 'Path must be set to a valid value', 'BadPort' => 'Port must be set to a valid number', 'BadPostEventCount' => 'Post event image count must be an integer of zero or more', diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php index 715c057d7..742d80bc8 100644 --- a/web/skins/classic/views/js/monitor.js.php +++ b/web/skins/classic/views/js/monitor.js.php @@ -56,6 +56,8 @@ function validateForm( form ) { errors[errors.length] = ""; if ( !form.elements['newMonitor[Format]'].value || !form.elements['newMonitor[Format]'].value.match( /^\d+$/ ) ) errors[errors.length] = ""; + if ( form.elements['newMonitor[VideoWriter]'].value == 2 /* Passthrough */ ) + errors[errors.length] = ""; } else if ( form.elements['newMonitor[Type]'].value == 'Remote' ) { //if ( !form.elements['newMonitor[Host]'].value || !form.elements['newMonitor[Host]'].value.match( /^[0-9a-zA-Z_.:@-]+$/ ) ) //errors[errors.length] = ""; @@ -63,6 +65,8 @@ function validateForm( form ) { errors[errors.length] = ""; //if ( !form.elements['newMonitor[Path]'].value ) //errors[errors.length] = ""; + if ( form.elements['newMonitor[VideoWriter]'].value == 2 /* Passthrough */ ) + errors[errors.length] = ""; } else if ( form.elements['newMonitor[Type]'].value == 'Ffmpeg' ) { if ( !form.elements['newMonitor[Path]'].value ) //|| !form.elements['newMonitor[Path]'].value.match( /^\d+$/ ) ) // valid url @@ -71,6 +75,8 @@ function validateForm( form ) { } else if ( form.elements['newMonitor[Type]'].value == 'File' ) { if ( !form.elements['newMonitor[Path]'].value ) errors[errors.length] = ""; + if ( form.elements['newMonitor[VideoWriter]'].value == 2 /* Passthrough */ ) + errors[errors.length] = ""; } else if ( form.elements['newMonitor[Type]'].value == 'WebSite' ) { if ( form.elements['newMonitor[Function]'].value != 'Monitor' && form.elements['newMonitor[Function]'].value != 'None') errors[errors.length] = "";