From 2ab4e92db015f7ab05d1e1756fe6651984023cc2 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Thu, 15 Aug 2013 09:51:53 +0100 Subject: [PATCH] Permit rips of .iso files, and update x264 constant quality format --- source/lib/RippingCluster/Source/Plugin/HandBrake.class.php | 4 ++-- .../RippingCluster/Utility/DvdDirectoryIterator.class.php | 4 ++-- source/webui/templates/rips/setup.tpl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/lib/RippingCluster/Source/Plugin/HandBrake.class.php b/source/lib/RippingCluster/Source/Plugin/HandBrake.class.php index 94a9cb3..f365a29 100644 --- a/source/lib/RippingCluster/Source/Plugin/HandBrake.class.php +++ b/source/lib/RippingCluster/Source/Plugin/HandBrake.class.php @@ -199,7 +199,7 @@ class RippingCluster_Source_Plugin_HandBrake extends RippingCluster_PluginBase i $config = RippingCluster_Main::instance()->config(); // Ensure the source is a valid directory, and lies below the configured source_dir - if ( ! is_dir($source_filename)) { + if ( ! is_dir($source_filename) && ! preg_match('/\.iso$/', $source_filename)) { return false; } $real_source_filename = realpath($source_filename); @@ -234,4 +234,4 @@ class RippingCluster_Source_Plugin_HandBrake extends RippingCluster_PluginBase i } -?> \ No newline at end of file +?> diff --git a/source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php b/source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php index 82a2c5e..218fb60 100644 --- a/source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php +++ b/source/lib/RippingCluster/Utility/DvdDirectoryIterator.class.php @@ -2,8 +2,8 @@ class RippingCluster_Utility_DvdDirectoryIterator extends FilterIterator { public function accept() { - return is_dir($this->current()->getPathname() . DIRECTORY_SEPARATOR . 'VIDEO_TS'); + return is_dir($this->current()->getPathname() . DIRECTORY_SEPARATOR . 'VIDEO_TS') || preg_match('/\.iso$/', $this->current()->getPathname()); } } -?> \ No newline at end of file +?> diff --git a/source/webui/templates/rips/setup.tpl b/source/webui/templates/rips/setup.tpl index 998eebd..8f08fd3 100644 --- a/source/webui/templates/rips/setup.tpl +++ b/source/webui/templates/rips/setup.tpl @@ -150,10 +150,10 @@ $("#available-titles").accordion({active: {/literal}{$source->longestTitleIndex()}{literal}}); $("input:submit").button(); $("#quantizer-slider").slider({ - value:0.61, + value:20, min: 0, - max: 1.0, - step: 0.01, + max: 51, + step: 1, slide: function(event, ui) { $("#global-quantizer").val(ui.value); }