Isaac Connor
|
d96febd967
|
when ZM_DIR_EVENTS is relative, append ZM_PATH_WEB
|
2016-09-21 16:00:23 -04:00 |
|
Isaac Connor
|
4b5af390fd
|
merge
|
2016-09-21 12:44:27 -04:00 |
|
Isaac Connor
|
249d3cadc5
|
fix for video on stream 1
|
2016-09-21 12:17:09 -04:00 |
|
Isaac Connor
|
1310aee1cc
|
handle video stream at index 1 without audio
|
2016-09-21 12:12:40 -04:00 |
|
Isaac Connor
|
6292ce3748
|
undo stupid thing
|
2016-09-21 12:07:58 -04:00 |
|
Isaac Connor
|
2f248cd4b1
|
log time bases on videostore instantiation instead of every packet
|
2016-09-21 11:58:59 -04:00 |
|
Isaac Connor
|
f5405a4131
|
clearer debug output
|
2016-09-21 11:57:42 -04:00 |
|
Isaac Connor
|
ae63861cd1
|
better codec_tag setting
|
2016-09-21 11:57:30 -04:00 |
|
Isaac Connor
|
8b13401250
|
more debugging
|
2016-09-21 11:37:59 -04:00 |
|
Isaac Connor
|
a8c4fdd616
|
more debug
|
2016-09-21 10:58:02 -04:00 |
|
Isaac Connor
|
e1a29f47b9
|
more debug
|
2016-09-21 10:57:21 -04:00 |
|
Isaac Connor
|
4359c65601
|
better debugging of timebase
|
2016-09-21 10:56:09 -04:00 |
|
Isaac Connor
|
091459004c
|
ServerId can be 0
|
2016-09-21 10:30:31 -04:00 |
|
Isaac Connor
|
e0b0b42966
|
fixup dts calcs
|
2016-09-21 10:29:49 -04:00 |
|
Isaac Connor
|
a3eae187f9
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-21 10:15:54 -04:00 |
|
Isaac Connor
|
01d4ca96c7
|
av_unref_packet should be av_packet_unref
|
2016-09-21 10:15:23 -04:00 |
|
Isaac Connor
|
288b03290c
|
remark out some debugging
|
2016-09-21 09:05:55 -04:00 |
|
Isaac Connor
|
f0a9820096
|
need to convert NULL values before saying not null
|
2016-09-20 17:53:35 -04:00 |
|
Isaac Connor
|
912d6b0f6c
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-20 17:03:23 -04:00 |
|
Isaac Connor
|
19a60b01da
|
maybe fixes, maybe big memleaks
|
2016-09-20 16:59:43 -04:00 |
|
Isaac Connor
|
364a80fb94
|
don't output jpeg header unless there is some kind of success
|
2016-09-20 15:55:28 -04:00 |
|
Isaac Connor
|
f40c8d0da8
|
contains due to glob
|
2016-09-20 15:54:37 -04:00 |
|
Isaac Connor
|
bc0b499697
|
update zm_create.sql.in to match the update scripts
|
2016-09-20 14:10:37 -04:00 |
|
Isaac Connor
|
a03d2a393f
|
add ffmpeg as an option to libav-tools
|
2016-09-20 13:22:49 -04:00 |
|
Isaac Connor
|
33ab9d3098
|
instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
|
2016-09-20 12:19:44 -04:00 |
|
Isaac Connor
|
5ce2e95fb7
|
replace getDiskPercent call with code to show percent for all storageareas
|
2016-09-20 12:18:50 -04:00 |
|
Isaac Connor
|
fb610ba87d
|
fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms
|
2016-09-20 12:18:20 -04:00 |
|
Isaac Connor
|
1add270b72
|
fixup saving Filters and executing them
|
2016-09-20 12:17:19 -04:00 |
|
Isaac Connor
|
f06723a178
|
add disk_usage_percent and fix whitespace
|
2016-09-20 12:16:49 -04:00 |
|
Isaac Connor
|
5604fe5610
|
add more debugging and fix LinkPath -> LinkPath
|
2016-09-20 12:16:07 -04:00 |
|
Isaac Connor
|
a3e99cf08d
|
quick update to Monitor to use Object methods
|
2016-09-20 12:15:48 -04:00 |
|
Isaac Connor
|
ae80fd4d2d
|
put startTime init back where it belongs
|
2016-09-19 21:33:20 -04:00 |
|
Isaac Connor
|
d63c1810be
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-19 21:09:55 -04:00 |
|
Isaac Connor
|
cc763a858e
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-09-19 16:45:13 -04:00 |
|
Isaac Connor
|
e228de6ebe
|
detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path
|
2016-09-19 16:44:43 -04:00 |
|
Isaac Connor
|
61df6e9d75
|
Work on aac encoding
|
2016-09-16 15:54:13 -04:00 |
Isaac Connor
|
9347c550c2
|
Merge pull request #1628 from bhaal2/storageareas
Fixes to getDiskPercent()
|
2016-09-16 12:52:15 -04:00 |
bhaal2
|
c74af40ffb
|
Had file open with old stuff. Fixed now.
|
2016-09-17 02:20:17 +10:00 |
|
bhaal2
|
aee6ae956d
|
Moved '%' to getDiskPercent() where it should have been.
|
2016-09-17 02:13:33 +10:00 |
|
bhaal2
|
c95e449bbd
|
Modifications to getDiskPercent():
Moved '%' to this function instead of at end of html in skins/classing/include/functions.php
Changed from SQL query to Storage area object model.
|
2016-09-17 02:11:07 +10:00 |
|
Isaac Connor
|
d4645cd94a
|
we should be queueing packets regardless of recording state
|
2016-09-16 11:03:16 -04:00 |
|
Isaac Connor
|
fbc0729c83
|
code cleanup, more use of av_strerr to give better error logs.
|
2016-09-16 10:14:58 -04:00 |
|
Isaac Connor
|
05f061b84b
|
Merge ../ZoneMinder.master into packetqueue
|
2016-09-16 09:58:04 -04:00 |
|
Isaac Connor
|
9b0630a5b1
|
Merge branch 'master' into storageareas
|
2016-09-16 09:57:03 -04:00 |
|
Isaac Connor
|
bd076fed69
|
Merge branch 'storageareas' into packetqueue
|
2016-09-16 09:56:41 -04:00 |
|
Isaac Connor
|
66ae5c52ae
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-09-16 09:36:41 -04:00 |
|
Isaac Connor
|
ba73b839d4
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-16 09:00:50 -04:00 |
|
Isaac Connor
|
18ae1298c4
|
need this update that converts StorageId to NOT NULL default 0
|
2016-09-16 09:00:34 -04:00 |
|
Isaac Connor
|
8871d4155d
|
Merge branch 'startup_time' into storageareas
|
2016-09-15 11:47:38 -04:00 |
|
Isaac Connor
|
81c0b28786
|
fix call to setStartTime
|
2016-09-15 11:43:08 -04:00 |