ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,493 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

7493 Commits

Author SHA1 Message Date
corax d017138550 Fix a 'false friend' in German translation 2016-09-09 11:25:12 +02:00
Isaac Connor 5fb1c45c4e Merge ../ZoneMinder.connortechnology into storageareas 2016-09-08 11:34:36 -04:00
Isaac Connor 7b0a14ee72 change doulbe quotes to single quotes. Detect if we can't chdir into the monitor dir. 2016-09-08 11:06:02 -04:00
Isaac Connor 6e9cb06290 Merge branch 'storageareas' into packetqueue 2016-09-08 09:40:52 -04:00
Isaac Connor f67a58723c Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:40:05 -04:00
Steve Gilvarry 34a85ba3f1 Moron forgot a file 2016-09-08 23:39:04 +10:00
Isaac Connor 7a62d84bd2 Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:23:31 -04:00
Isaac Connor 3c228e6c16 Merge pull request #1614 from pliablepixels/1537-zone-controller-bug 
1537 zone controller bug
 2016-09-07 12:52:09 -04:00
Steve Gilvarry 33baa3b302 Free Audio and pickup unconverted video codec context. 2016-09-06 23:25:59 +10:00
Steve Gilvarry e40acc301d Add mAudioCodecContext and mAudioCodec and turn existing into video 
versions. Check if audio stream available and check audio stream codec
same as video is being checked now. Was Seg faulting if no audio stream.
 2016-09-06 01:27:57 +10:00
Pliable Pixels 1440dd9265 retab 2016-09-03 15:02:32 -04:00
Pliable Pixels 7bf0b3c423 readded forMonitor - removed by mistake 2016-09-03 14:51:24 -04:00
Pliable Pixels 9a4330eb59 #1537 Zones Controller not returning all zones 2016-09-03 14:46:47 -04:00
Kyle Johnson d6852e10b7 Merge pull request #1609 from connortechnology/fix_1606 
implement suggested code to stop the monitor when Function is set to …
 2016-09-01 22:57:57 -06:00
Isaac Connor dfb06fd548 Merge pull request #1607 from mattdurant/fix_issue_1460 
Fix issue #1460
 2016-09-01 14:02:13 -04:00
Isaac Connor 21431a5733 Merge pull request #1608 from mattdurant/issue_1590 
Added check for SINGLE_IMAGE to ignore socket closed by remote side
 2016-09-01 12:30:47 -04:00
Isaac Connor e0472cf820 Merge pull request #1602 from mdrush/1601-fix-ssmtp-messages 
added missing ssmtp support in sendMessage
 2016-09-01 11:49:42 -04:00
Isaac Connor 55f5db55dd implement suggested code to stop the monitor when Function is set to None 2016-09-01 11:43:20 -04:00
Isaac Connor 81e9d31a95 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-01 10:53:35 -04:00
Isaac Connor 586eab25e6 Merge branch 'fix_issue_1460' of https://github.com/mattdurant/ZoneMinder into merge_1607 2016-09-01 10:25:00 -04:00
Isaac Connor 10abe98e91 merge from packet queue. add monitorId to livestream div lookup 2016-09-01 10:15:12 -04:00
Isaac Connor 9262487a77 deprecate wasRecording 2016-09-01 10:10:16 -04:00
Isaac Connor f723e29b33 stash refactor in zm_remote_camera_rtsp 2016-09-01 10:10:03 -04:00
Matt Durant 350352d956 Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1. 2016-08-31 20:56:30 -05:00
Matt Durant 0950ecbcb9 Replaced loops to create color tables during initialization with statically declared arrays. 2016-08-31 19:36:14 -05:00
Steve Gilvarry 957c8fbdbf Merge pull request #8 from connortechnology/monitor_packetqueue 
Monitor packetqueue
 2016-09-01 08:11:17 +10:00
Isaac Connor 17e7f0ecfb Merge branch 'monitor_packetqueue' into packetqueue 2016-08-31 16:59:43 -04:00
Isaac Connor d5f60ad3f8 merge pertinent restructuring and packet queue worko 2016-08-31 16:58:59 -04:00
Isaac Connor 9d19e2587c fix should only write out the queue if we are starting a new event 2016-08-31 16:58:41 -04:00
Isaac Connor df6844a8d2 change return code for when writing an audio packet when no audio otuput stream. -1 causes bad things to happen 2016-08-31 16:47:51 -04:00
Isaac Connor 8bb956c3b1 re-organize to remove code duplication and make logic clearer 2016-08-31 16:47:15 -04:00
Isaac Connor 9153d2a986 when the audio stream is not aac, don't save it. 2016-08-31 15:59:05 -04:00
Isaac Connor a1941c5a65 variable renaming to be more readable. Don't save anythign except AAC. 2016-08-31 15:46:19 -04:00
Isaac Connor a51944b2c5 cleanup, remove separate audio and video queues 2016-08-31 15:38:44 -04:00
Isaac Connor 4dce24a276 write out queued packets when instantiating videostore 2016-08-31 15:38:24 -04:00
Isaac Connor ddb7398017 fix scaling because the livestream has the monitorId appended to it now 2016-08-31 13:26:53 -04:00
Isaac Connor f35fe185fb the liveStream div now has the monitorId appended to it, so add that when we lookup the livestream and put a new rand on it to force a reload 2016-08-31 12:53:34 -04:00
Isaac Connor 824d7c5b43 Merge ../ZoneMinder.Steve into packetqueue 2016-08-31 11:58:22 -04:00
Isaac Connor 55c6e5a6db cleanup putting packetqueue in the monitor. It should be in the camera 2016-08-31 11:47:42 -04:00
Isaac Connor 35d4650a1f Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-31 11:38:41 -04:00
Isaac Connor e51cc7efc8 add a missing / in error message 2016-08-31 11:21:46 -04:00
Steve Gilvarry e371d9ec7f Merge pull request #7 from connortechnology/feature-h264-videostorage 
Feature h264 videostorage
 2016-09-01 01:07:33 +10:00
Isaac Connor e74bf3fedf pull in the new byte range code for viewing videos 2016-08-31 10:58:50 -04:00
Isaac Connor fb35f5c48a Merge ../ZoneMinder.master into feature-h264-videostorage 2016-08-31 10:58:19 -04:00
Isaac Connor 5f07911a63 fix spacing 2016-08-31 10:09:42 -04:00
Isaac Connor ed1b6ccd58 Implement range support 2016-08-31 10:09:01 -04:00
Steve Gilvarry d1bcb14629 Right direction 2016-09-01 00:00:10 +10:00
Isaac Connor ffaf046485 fix missing / 2016-08-30 14:51:56 -04:00
Isaac Connor 27c1f95607 handle when ZM_BASE_PATH == '/' 2016-08-30 14:36:14 -04:00
Isaac Connor a28e7d8df8 fix typo 2016-08-30 14:24:51 -04:00