Commit Graph

14018 Commits

Author SHA1 Message Date
Isaac Connor 4c206c2e9a Upgrade Control Object to extend ZM\Object. Add commands function from skin specific control functions 2019-09-19 14:55:17 -04:00
Isaac Connor d5ee73a9ee use CaptureResolution instead of CaptureDimensions because it is already in language 2019-09-19 10:50:20 -04:00
Isaac Connor 1bd70319a9 Add a dimensions dropdown to ease entering monitor dimensions 2019-09-19 10:48:25 -04:00
Isaac Connor 2caca5f3ad Merge branch 'master' into update_monitor_saving 2019-09-18 11:41:16 -04:00
Isaac Connor 9889311b03 Handle username=&password= as well in HostController::login 2019-09-18 11:40:55 -04:00
Isaac Connor 458268d866 Merge branch 'master' into update_monitor_saving 2019-09-18 11:40:09 -04:00
Isaac Connor b3b7ec660b Add a test for the built-in layouts. Can't edit them. 2019-09-18 11:19:28 -04:00
Isaac Connor 9e8c17dfaf Merge branch 'master' into tolland-remove-extra-px 2019-09-18 11:17:50 -04:00
Isaac Connor 0eb1fff5b5 remove unused view=image-ffmpeg 2019-09-18 11:16:49 -04:00
Isaac Connor f509b4c9d1 spacing 2019-09-18 11:10:40 -04:00
Isaac Connor 1407d849e8 deprecate getStreamSrc in functions.php. 2019-09-18 11:10:25 -04:00
Isaac Connor 78ac2bc555 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-17 14:58:40 -04:00
Isaac Connor 17e00cec94 Fix setting rtsp_transport when rtsp 2019-09-17 14:58:16 -04:00
Isaac Connor 6d19ad7dd8 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-17 12:54:04 -04:00
Isaac Connor e8e29d62b2 Use dts instead of pts for first values 2019-09-17 12:53:29 -04:00
Isaac Connor ce1823bd29 spacing and fix saving 2019-09-17 12:46:11 -04:00
Isaac Connor bcaabf4cf2 update buttons 2019-09-17 12:09:36 -04:00
Isaac Connor e0074692d1 Remove debug 2019-09-17 12:07:30 -04:00
Isaac Connor ad84736cb4 spacing 2019-09-17 12:07:24 -04:00
Isaac Connor ff8e9fa072 Don't glob skins dir and css dirs unless our skin or css is invalid. 2019-09-17 12:07:10 -04:00
Isaac Connor f0cfd674c1 Cleanup options skins tab. Setting the values happens in index.php. Use global and 2019-09-17 12:06:54 -04:00
Isaac Connor 0d347f0cf5 init log early so that we create zmc_m.log instead of undef.log 2019-09-17 11:37:48 -04:00
Isaac Connor 6041616efc add string_toupper function 2019-09-17 11:37:20 -04:00
Isaac Connor 33aa6abf59 Only open log file if we are going to write to it. 2019-09-17 11:36:57 -04:00
Isaac Connor ecde0a7ae0 Add a string_toupper function 2019-09-17 11:11:22 -04:00
Isaac Connor 1a94479751 Cleanup/rework. Handle database connection failure. This can happen if we init logging before config reading. Default terminal log level to warning. Cleanup logInit copying the options in order to populate mLogPath from config. We can handle this in the constructor now. 2019-09-17 11:10:59 -04:00
Isaac Connor 9a3765f6aa spacing and google code style 2019-09-17 10:31:48 -04:00
Isaac Connor 4509c6a239 Don't set rtsp options unless we are using rtsp. Should prevent everyone from reporting the warning about unsupported options. Note that I removed some extra includs that have no business in zm_ffmpeg_camera. 2019-09-17 10:31:31 -04:00
Isaac Connor c8934dac7f Remove useless debug 2019-09-17 10:30:00 -04:00
Isaac Connor cbf9931371 Don't log about calling dbConnect when already connected. We make this call in zm_logger, it is just going to have to be acceptable to call it multiple times. 2019-09-17 10:29:30 -04:00
Isaac Connor 54c14b17d7 Spacing and google code style 2019-09-17 10:28:42 -04:00
Isaac Connor 52c17f9651 Set event_path to '' to prevent warnings 2019-09-17 10:27:38 -04:00
Isaac Connor deefa0754d Backtick the fields when updating Monitors 2019-09-16 10:53:06 -04:00
Isaac Connor 4db931aac8 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-15 18:01:52 -04:00
Isaac Connor 6925a75831 codec not ready is not an error. Make it a debug 2019-09-15 18:01:38 -04:00
Isaac Connor 63db128edf Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-15 17:54:29 -04:00
Isaac Connor 60cf4586da Don't return a hostname when not in multi-server. Should prevent problems with reverse proxies 2019-09-15 17:54:23 -04:00
Isaac Connor 0a31a8dab6 Just use pts instead of tracking both first pts and first dts. Should prevent conflicts 2019-09-15 17:53:25 -04:00
Isaac Connor 675cbe8854 code style, add bytes per second read statistic and a code comment about the sleeping 2019-09-14 10:48:39 -04:00
Isaac Connor 6dc07f4f8a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-13 21:38:26 -04:00
Isaac Connor 306bda86c2 fix sws_get_delay 2019-09-13 21:28:43 -04:00
Isaac Connor bbd3dfc318 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-13 18:05:06 -04:00
Isaac Connor 845d0a0be3
Merge pull request #2706 from connortechnology/fix_2705
Fix 2705
2019-09-15 12:20:47 -04:00
Isaac Connor 32a1ab58b5 remove use of userLogin which was removed recently 2019-09-15 12:19:35 -04:00
Isaac Connor 193a71dfbd add libavresample-dev to depends 2019-09-13 16:10:15 -04:00
Isaac Connor 1653270afd Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-13 16:06:47 -04:00
Isaac Connor eafa0da06f fixes, handle when audio codec isn't open in ffmpeg_camera 2019-09-13 16:06:25 -04:00
Isaac Connor 3a5d1ff3ca Hack in missing bits for ubuntu trusty/libav/avresample 2019-09-13 15:51:35 -04:00
Isaac Connor e71817c32e Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-13 14:35:11 -04:00
Isaac Connor 5ddd20ed1a refactor code. Handle resample buffering during encoding instead of when closing file 2019-09-13 14:34:53 -04:00