some streaming options are now available even when streaming is off

diff --git a/src/config.py b/src/config.py
index 4fc0676cb5d00b7a93d2914c6b4230dd4cea48ef..6f23d2a56188998e0bd44fffa047a7b53172508e 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -527,10 +527,6 @@ def camera_ui_to_dict(ui):
         if data['width'] > 320:
             data['text_double'] = True
     
-    if not ui.get('video_streaming', True):
-        data['webcam_maxrate'] = 5
-        data['webcam_quality'] = 85
-
     if ui.get('still_images', False):
         capture_mode = ui.get('capture_mode', 'motion-triggered')
         if capture_mode == 'motion-triggered':

diff --git a/static/js/main.js b/static/js/main.js
index b42b55b6727b137d43839b9a6a97b2ccb84e105d..3c2873c35247801f66ad74b69bbf02f51aa8617d 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -395,7 +395,7 @@ function updateConfigUi() {
     
     /* video streaming switch */
     if (!$('#videoStreamingSwitch').get(0).checked) {
-        $('#videoStreamingSwitch').parent().next('table.settings').find('tr.settings-item').each(markHide);
+        $('#videoStreamingSwitch').parent().next('table.settings').find('tr.settings-item').not('.local-streaming').each(markHide);
     }
     
     /* still images switch */

diff --git a/templates/main.html b/templates/main.html
index 58c1f9dfcc5b0d9e335bdd3cf3d35e8f4e721066..5ce1676f5ac1f2da5479d168a18c3da4490562b3 100644 (file)
--- a/templates/main.html
+++ b/templates/main.html
@@ -240,12 +240,12 @@
 
                 <div class="settings-section-title"><input type="checkbox" class="styled section streaming" id="videoStreamingSwitch">Video Streaming</div>
                 <table class="settings">
-                    <tr class="settings-item advanced-setting">
+                    <tr class="settings-item advanced-setting local-streaming">
                         <td class="settings-item-label"><span class="settings-item-label">Streaming Frame Rate</span></td>
                         <td class="settings-item-value"><input type="text" class="range styled streaming" id="streamingFramerateSlider"></td>
                         <td><span class="help-mark" title="sets the number of frames transmitted every second on the live streaming">?</span></td>
                     </tr>
-                    <tr class="settings-item advanced-setting">
+                    <tr class="settings-item advanced-setting local-streaming">
                         <td class="settings-item-label"><span class="settings-item-label">Streaming Quality</span></td>
                         <td class="settings-item-value"><input type="text" class="range styled streaming" id="streamingQualitySlider"></td>
                         <td><span class="help-mark" title="sets the live streaming quality (higher values yield a better video quality but require more bandwidth)">?</span></td>