01d4ca96c7
av_unref_packet should be av_packet_unref
2016-09-21 10:15:23 -04:00
288b03290c
remark out some debugging
2016-09-21 09:05:55 -04:00
e4887e1c94
Merge branch 'storageareas' of https://github.com/bhaal2/ZoneMinder into storageareas
2016-09-21 21:53:24 +10:00
b9b1dd144c
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 21:41:22 +10:00
34d586a936
@connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well.
2016-09-21 20:54:15 +10:00
6c3d877d99
Storageareas ( #2 )
...
* quick update to Monitor to use Object methods
* add more debugging and fix LinkPath -> LinkPath
* add disk_usage_percent and fix whitespace
* fixup saving Filters and executing them
* 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
* replace getDiskPercent call with code to show percent for all storageareas
* instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields
* add ffmpeg as an option to libav-tools
* update zm_create.sql.in to match the update scripts
* contains due to glob
* don't output jpeg header unless there is some kind of success
* maybe fixes, maybe big memleaks
2016-09-21 10:11:40 +10:00
f0a9820096
need to convert NULL values before saying not null
2016-09-20 17:53:35 -04:00
912d6b0f6c
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-20 17:03:23 -04:00
19a60b01da
maybe fixes, maybe big memleaks
2016-09-20 16:59:43 -04:00
364a80fb94
don't output jpeg header unless there is some kind of success
2016-09-20 15:55:28 -04:00
f40c8d0da8
contains due to glob
2016-09-20 15:54:37 -04:00
bc0b499697
update zm_create.sql.in to match the update scripts
2016-09-20 14:10:37 -04:00
4750c016c4
define a zm version of av_frame_alloc to clean up code
2016-09-20 14:05:28 -04:00
97053df0b1
define a zm version of av_frame_alloc to clean up code
2016-09-20 14:05:25 -04:00
d26f3c9a6c
define a zm version of av_frame_alloc to clean up code
2016-09-20 14:05:16 -04:00
a03d2a393f
add ffmpeg as an option to libav-tools
2016-09-20 13:22:49 -04:00
bf45f489f7
Merge branch 'storageareas' into record_audio
2016-09-20 12:38:47 -04:00
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
5ce2e95fb7
replace getDiskPercent call with code to show percent for all storageareas
2016-09-20 12:18:50 -04:00
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
1add270b72
fixup saving Filters and executing them
2016-09-20 12:17:19 -04:00
f06723a178
add disk_usage_percent and fix whitespace
2016-09-20 12:16:49 -04:00
5604fe5610
add more debugging and fix LinkPath -> LinkPath
2016-09-20 12:16:07 -04:00
a3e99cf08d
quick update to Monitor to use Object methods
2016-09-20 12:15:48 -04:00
0614af4f51
work on audio encoding
2016-09-20 10:10:02 -04:00
78b08683a8
Merge pull request #1 from ZoneMinder/storageareas
...
Storageareas
2016-09-20 21:55:38 +10:00
ae80fd4d2d
put startTime init back where it belongs
2016-09-19 21:33:20 -04:00
d63c1810be
Merge ../ZoneMinder.master into storageareas
2016-09-19 21:09:55 -04:00
cc763a858e
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
2016-09-19 16:45:13 -04:00
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
61df6e9d75
Work on aac encoding
2016-09-16 15:54:13 -04:00
9347c550c2
Merge pull request #1628 from bhaal2/storageareas
...
Fixes to getDiskPercent()
2016-09-16 12:52:15 -04:00
c74af40ffb
Had file open with old stuff. Fixed now.
2016-09-17 02:20:17 +10:00
aee6ae956d
Moved '%' to getDiskPercent() where it should have been.
2016-09-17 02:13:33 +10:00
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
d4645cd94a
we should be queueing packets regardless of recording state
2016-09-16 11:03:16 -04:00
fbc0729c83
code cleanup, more use of av_strerr to give better error logs.
2016-09-16 10:14:58 -04:00
05f061b84b
Merge ../ZoneMinder.master into packetqueue
2016-09-16 09:58:04 -04:00
9b0630a5b1
Merge branch 'master' into storageareas
2016-09-16 09:57:03 -04:00
bd076fed69
Merge branch 'storageareas' into packetqueue
2016-09-16 09:56:41 -04:00
66ae5c52ae
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-09-16 09:36:41 -04:00
ba73b839d4
Merge ../ZoneMinder.connortechnology into storageareas
2016-09-16 09:00:50 -04:00
18ae1298c4
need this update that converts StorageId to NOT NULL default 0
2016-09-16 09:00:34 -04:00
8871d4155d
Merge branch 'startup_time' into storageareas
2016-09-15 11:47:38 -04:00
81c0b28786
fix call to setStartTime
2016-09-15 11:43:08 -04:00
06c73954d6
move set|getStartTime functions down to where they need to be.
2016-09-15 11:42:51 -04:00
ae4a4681cd
fix using wrong var
2016-09-15 11:41:42 -04:00
8f33ed6ca6
introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started.
2016-09-15 11:16:05 -04:00
5f46b8f942
Merge pull request #1621 from connortechnology/fix_1620
...
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
2c21fe80e7
Merge pull request #1626 from bhaal2/storageareas
...
Storageareas
2016-09-15 10:18:11 -04:00
Isaac Connor
bhaal2
Isaac Connor