492be7cc33
make last_zoom last_scale last_x and last_y members of the StreamBase object instead of static vars so that we can access them in monitorStream
2019-09-26 13:51:49 -04:00
09934ed7f5
Fix sendTextFrame
2019-07-26 12:21:25 -04:00
8417230690
debug where the comms sock is
2019-03-18 10:55:08 -04:00
9b713a489d
fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
...
handle infinite fps
2019-03-06 14:50:36 -05:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
abfb5642c8
cleanup and document updateFrameRate
2019-03-06 09:46:28 -05:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -05:00
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
a81428f701
add a test for a 0 fps passed in to updateFrameRate which would cause an infinite loop. Fixes #2427
2019-01-21 13:30:00 -05:00
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
84c812725e
spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <.
2019-01-14 14:00:45 -05:00
bc5f8d0d8d
rework pts/dts of audio stream. Spacing. Fix crash
2018-12-04 18:23:08 -05:00
e24a308481
Merge branch 'master' into h265
2018-11-14 17:15:37 -05:00
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
230ce61dc4
fix #2296 by prepending bind with ::
2018-11-07 11:54:18 -05:00
09fab280ea
SOCKS dir creation logs should be debug
2018-11-02 10:57:47 -04:00
33235a19ba
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:11:32 -04:00
9e999294df
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2018-10-28 15:09:32 -04:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
c7f9ffa521
Merge pull request #2217 from connortechnology/touch_lockfile
...
Touch lockfile
2018-10-11 08:45:09 -05:00
53057eae25
Always make SOCK_DIR as it may not exist due to running under systemd and being chrooted
2018-09-23 16:51:06 -04:00
c8549e41da
touch the zms lock file every hour so that we can determine which ones are stale
2018-09-21 15:58:14 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
498435886f
improve debug message
2018-09-11 13:22:35 -04:00
185586ecd4
we must try to create the SOCK_DIR because nowadays systemd is chrooting processes and PATH_SOCKS may not exist
2018-08-10 11:15:15 -04:00
f089f7d4bd
Add a mkdir for the ZM_SOCKS_PATH
2018-08-06 10:34:08 -04:00
b974b4dcd1
google code style, and when paused, don't die after 10 seconds
2018-04-12 13:14:00 -04:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
f98217e62a
remove useless debug code
2018-01-28 15:17:48 -05:00
70d43d2d27
fix strncpy calls
2017-12-12 13:42:48 -05:00
ec99c96587
remove unneccesary assignment
2017-12-12 12:38:40 -05:00
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -05:00
fe42eed1ea
cannot unlink the lock file, it has to stick around.
2017-11-22 11:43:13 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -05:00
3af52256b8
turn down debug
2017-11-21 23:57:34 -05:00
d5962b11ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:48:38 -05:00
cab8c4cd5e
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
2017-11-03 13:49:42 -04:00
ab1c9f7c98
add more debugging
2017-10-31 16:27:43 -04:00
df14b3c812
handle failure to connect to zmc in zms gracefully
2017-10-24 16:22:26 -07:00
fece06c9e3
google code style
2017-10-19 17:12:36 -04:00
e0d99018aa
Google code style, add a warning if no sd
2017-10-19 16:08:20 -04:00
0d8e4656dc
fix braces
2017-06-26 09:46:07 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
bb50784ed2
braces
2017-05-20 09:53:35 -04:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
2385575c56
fix +1 being outside bind()
2016-06-02 16:23:04 -04:00
435a1f7a2e
remove duplicated locking code created by bind_fixes
2016-05-17 09:11:52 -04:00
341ebc7b45
Merge branch 'master' into bind_fixes
2016-05-02 12:39:55 -04:00
0dc2987b84
add some error checking, but fix the call to bind which really should have a +1 in it.
2016-04-28 16:32:50 -04:00
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Isaac Connor
Isaac Connor
Andy Bauer
Isaac Connor