Commit Graph

42 Commits

Author SHA1 Message Date
Isaac Connor 834dfbfe0c Merge branch 'storageareas' into zma_to_thread 2018-01-01 16:38:54 -05:00
Isaac 9dfad4886d fix saving Monitors 2017-12-22 16:13:00 +01:00
Isaac Connor 99968dfa2a Merge branch 'storageareas' into zma_to_thread 2017-11-27 11:28:36 -05:00
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 8e494ef431 Merge branch 'storageareas' into zma_to_thread 2017-11-23 08:40:49 -05:00
Isaac Connor 095e1ecadb remove extra ), add AnalysisFPS and CaptureFPS 2017-11-21 23:58:13 -05:00
Isaac Connor e617ffca2d can't use BASE_URL since it will be empty. Have to construct a full URL when using MIN_STREAMING_PORT 2017-11-21 21:00:27 -05:00
Isaac Connor bb6e6c18eb add defaults for CaptureFPS and AnalysisFPS 2017-11-14 13:17:50 -08:00
Isaac Connor bafdf1fdfc add codecs and containers 2017-11-13 21:41:57 -05:00
Isaac Connor 57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
Isaac Connor bef7c0ed94 Only start a monitor if it has a Function 2017-11-05 11:54:00 -05:00
Isaac Connor bc150574c7 wip import 2017-10-26 18:56:10 -07:00
Isaac Connor ced5015a83 move zmcControl and zmaControl to the Monitor Object 2017-10-23 17:00:59 -07:00
Isaac Connor 09242d72b3 implement alternate ports for streaming 2017-10-05 16:05:41 -04:00
Isaac Connor 371b86300a Merge branch 'master' into storageareas 2017-06-08 14:23:40 -04:00
Isaac Connor 2c1f576da4 Don't need to check for values in args, beacuse we set one above 2017-06-08 14:01:44 -04:00
Isaac Connor ad4264dad7 spacing 2017-06-05 15:21:27 -04:00
Isaac Connor ac8b09e89c merge some trivial updates from storageareas 2017-05-16 14:14:07 -04:00
Isaac Connor c4caa9a631 convert arguments from an array of strong to a hash and use http_build_query 2017-02-27 21:48:08 -05:00
Isaac Connor 091459004c ServerId can be 0 2016-09-21 10:30:31 -04:00
Isaac Connor a28e7d8df8 fix typo 2016-08-30 14:24:51 -04:00
Isaac Connor 6204ed8dd4 correct incorrect use of isset instead of array_key_exists 2016-08-30 13:43:49 -04:00
Isaac Connor d6b126fe8c Add caller and line when an unknown function is called on the Monitor object 2016-08-22 11:28:53 -04:00
Isaac Connor c82c872665 add a default NULL value to __construct 2016-08-17 10:31:16 -04:00
Isaac Connor f9e7d3ccd8 fix error messages when an empty Monitor is instantiated 2016-08-09 10:43:51 -04:00
Isaac Connor 791c8fb3d5 add setting of object property 2016-06-24 10:30:56 -04:00
Isaac Connor 4230bd1bd5 move the control_fields into the class so that it is available. 2016-06-20 12:46:23 -04:00
Isaac Connor 9c7b22086f introduce a hash to define the fields and default values of the control table. Primarily this is to prevent method warnings when a monitor is not controllable 2016-06-20 12:41:14 -04:00
Isaac Connor 0f1a1a6294 log invalid calls to Monitor Object 2016-06-14 12:38:17 -04:00
Isaac Connor 4b782efd54 Whitespace fixes 2016-05-05 15:30:24 -04:00
Isaac Connor 868e5a51fa Rename some of the columns names when laoding Control settings as they conflict with Monitor columns 2016-04-04 16:44:21 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor c074f6e0bf Add a set function to take an array of value to set in the Object 2016-04-01 10:34:40 -04:00
Isaac Connor 45fc689203 implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220 2016-01-04 13:15:50 -05:00
Isaac Connor 6df1425897 Slight update to allow the instantiation with no row or Id 2015-12-22 09:52:33 -05:00
Isaac Connor 961dc90b0e add Server function 2015-12-02 11:21:04 -05:00
Isaac Connor 945949ebc0 fix __call to actually return the value 2015-12-01 15:16:18 -05:00
Isaac Connor e85ba683e1 improve constructor to handle numeric as well, and give error when something else 2015-12-01 14:29:57 -05:00
Isaac Connor e4f5f76782 rewrite constructor to take a row as well as an Id 2015-12-01 14:03:55 -05:00
Isaac Connor ba1100fc03 continue conversion from array to class of Monitor 2015-09-17 16:06:47 -04:00
Isaac Connor 13327b7651 Load Controls if appropriate 2015-09-17 15:34:09 -04:00
Isaac Connor 52cdb8a05a add Monitor class 2015-09-17 15:29:36 -04:00