Isaac Connor
|
85dd5ea00c
|
do the videostore test in the constructor
|
2016-09-26 20:08:09 -04:00 |
|
Isaac Connor
|
bd22d72e18
|
cleanups, code style, free resample_context
|
2016-09-26 11:01:47 -04:00 |
|
Isaac Connor
|
bd076fed69
|
Merge branch 'storageareas' into packetqueue
|
2016-09-16 09:56:41 -04:00 |
|
Isaac Connor
|
85b2ba73ab
|
change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH
|
2016-09-14 09:31:57 -04:00 |
|
Isaac Connor
|
88d86afd85
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-13 10:02:53 -04:00 |
|
Isaac Connor
|
2bc5742aec
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-09-13 09:53:39 -04:00 |
|
Isaac Connor
|
d0fb2acfaa
|
rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments
|
2016-09-12 21:35:14 -04:00 |
|
Isaac Connor
|
3a06ba7a65
|
Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later.
|
2016-09-09 09:15:04 -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 |
Steve Gilvarry
|
d1bcb14629
|
Right direction
|
2016-09-01 00:00:10 +10:00 |
|
Steve Gilvarry
|
44df4a830d
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 20:44:48 +10:00 |
|
Isaac Connor
|
14d8496972
|
add NULL test for RTSPDesribe
|
2016-07-14 10:27:24 -04:00 |
Isaac Connor
|
6644db3bea
|
check for null on various Monitor fields
|
2016-06-24 10:29:50 -04:00 |
|
Isaac Connor
|
081c0add72
|
fix
|
2016-06-23 11:25:50 -04:00 |
|
Isaac Connor
|
ccea620531
|
check for null before instantiating strings
|
2016-06-23 11:13:26 -04:00 |
|
Isaac Connor
|
c6761dd094
|
fix merge
|
2016-06-21 14:02:36 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
6a8db582ff
|
whitespacing updates
|
2016-06-21 12:21:18 -04:00 |
Isaac Connor
|
fad1d95011
|
fix NULL in linkedMonitors column
|
2016-06-09 13:06:57 -04:00 |
|
Isaac Connor
|
d9f2911f0d
|
handle null values in Monitors columns
|
2016-06-09 12:51:22 -04:00 |
|
Steve Gilvarry
|
0abfb7378a
|
Buffer work
|
2016-05-18 00:01:33 +10:00 |
|
Isaac Connor
|
943a4cef73
|
Merge branch 'storageareas' into rotate_video
|
2016-05-13 15:00:50 -04:00 |
|
Isaac Connor
|
71e9553648
|
add rotation to video
|
2016-05-13 14:51:26 -04:00 |
|
Isaac Connor
|
18461b0c64
|
Add some debugging
|
2016-05-06 12:39:10 -04:00 |
|
Isaac Connor
|
88a0bdc026
|
Add some code comments. Make mocord always honour section_length
|
2016-05-05 14:51:26 -04:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
5eebc50bfb
|
tabs to spaces
|
2016-04-29 08:57:31 -04:00 |
|
Isaac Connor
|
097e7f3906
|
Merge branch 'master' into storageareas
|
2016-04-28 16:40:44 -04:00 |
|
Isaac Connor
|
30b3fa8a8b
|
add a cast to help the compile figure out which function to use
|
2016-04-28 12:57:38 -04:00 |
|
Isaac Connor
|
fac07cba6d
|
Merge branch 'master' into tabs_to_spaces
|
2016-04-28 09:31:40 -04:00 |
Isaac Connor
|
629f141734
|
Merge pull request #1441 from SteveGilvarry/remove_commented_code
Delete large commented out code segment
|
2016-04-28 09:30:43 -04:00 |
|
Isaac Connor
|
24e3306955
|
master master
|
2016-04-28 09:20:56 -04:00 |
|
Isaac Connor
|
2d8c484792
|
rotate dimensions when instantiating the Monitor object
|
2016-04-25 16:48:26 -04:00 |
|
Isaac Connor
|
8c53925fdc
|
redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.
|
2016-04-25 16:00:34 -04:00 |
|
Isaac Connor
|
851e8f46ff
|
redo fix_rotate
|
2016-04-25 15:57:39 -04:00 |
|
Isaac Connor
|
26a45d5fa9
|
Don't rotate dimensions when constructing the monitor because they are already rotated
|
2016-04-25 13:55:28 -04:00 |
|
Steve Gilvarry
|
4ca61b7bd8
|
Removed 180 lines of commented out code that has been hanging around
in here for a long time.
|
2016-04-25 22:12:49 +10:00 |
|
Isaac Connor
|
44f32f46b7
|
deprecate zmdbFetchOne in favor of zmDbRow
|
2016-04-20 11:56:58 -04:00 |
|
Isaac Connor
|
30066f788d
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-04-14 12:35:21 -04:00 |
|
Isaac Connor
|
c189e60d9b
|
add some comments, and dump filename and AVFormatContext on failure to write header
|
2016-04-14 12:34:52 -04:00 |
|
Isaac Connor
|
dc7f2ff353
|
fix merge problems
|
2016-04-06 11:44:57 -04:00 |
|
Isaac Connor
|
765f79a87f
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 11:16:38 -04:00 |
|
Isaac Connor
|
4bc200f839
|
fix merge
|
2016-04-06 08:38:10 -04:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
03b1ced568
|
tabs to spaces and use 2space indenting
|
2016-04-04 10:11:48 -04:00 |
|
Isaac Connor
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
|
Isaac Connor
|
abcf48b65c
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-01 08:53:45 -04:00 |
|
Isaac Connor
|
56d95bb949
|
Merge branch 'iconnor_video' into storageareas
|
2016-03-31 14:02:56 -04:00 |
|
Isaac Connor
|
c26dbb9028
|
rough in record_audio, and do lots of whitespace cleanups
|
2016-03-31 12:54:56 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -04:00 |
|
Isaac Connor
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
|
Isaac Connor
|
204a128ecc
|
fix use of connected when it should be mem_ptr
|
2016-03-29 15:46:47 -04:00 |
|
Isaac Connor
|
1262e831ac
|
rework zmu to load data from the last event with frames when it can't connect to zmc
|
2016-03-29 14:36:16 -04:00 |
|
Isaac Connor
|
0c32ae61ef
|
Merge branch 'master' into fix_coverity_issues
|
2016-03-24 09:42:01 -04:00 |
|
SteveGilvarry
|
3ce620eb89
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-02-27 19:46:56 +11:00 |
|
Isaac Connor
|
68babd783b
|
Merge branch 'master' into storageareas
|
2016-02-17 09:46:56 -05:00 |
Kaarle Ritvanen
|
6332f28c53
|
zm_monitor: fix overlap in memcpy buffers
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
|
2016-02-16 11:47:49 +02:00 |
|
Isaac Connor
|
89cff287cd
|
Merge branch 'master' into storageareas
|
2016-02-04 12:14:16 -05:00 |
|
SteveGilvarry
|
7301e803ed
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
|
2016-01-30 15:45:08 +11:00 |
arjunrc
|
38bca6b95d
|
added CMD_QUIT to kill zms via command
|
2016-01-29 09:58:57 -05:00 |
|
Isaac Connor
|
f275498790
|
Add Debug for sql used to load other than local monitors
|
2016-01-26 21:00:32 -05:00 |
|
Isaac Connor
|
902065a6c1
|
Add Debug for sql used to load local monitors
|
2016-01-26 20:59:07 -05:00 |
|
Isaac Connor
|
98b6ef36d4
|
Merge branch 'multi-server' into newpointone
Conflicts:
src/zm_monitor.cpp
|
2015-12-28 13:13:15 -05:00 |
|
Isaac Connor
|
f357ea6ccd
|
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
|
2015-12-28 11:53:04 -05:00 |
|
Isaac Connor
|
ccded54937
|
put back missing col++
|
2015-12-28 11:52:40 -05:00 |
|
SteveGilvarry
|
3f1c782ff7
|
Fix random extra semicolon
|
2015-12-28 16:29:04 +11:00 |
|
Isaac Connor
|
eccfced6d4
|
Merge branch 'multi-server' into newpointone
Conflicts:
distros/ubuntu1204/apache.conf
|
2015-12-22 09:54:13 -05:00 |
|
Isaac Connor
|
e76cc59bad
|
revert whitespace changes
|
2015-12-21 13:42:44 -05:00 |
|
Isaac Connor
|
36f83aa412
|
revert whitespace changes
|
2015-12-21 13:35:17 -05:00 |
|
Isaac Connor
|
609ab79f81
|
revert whitespace changes
|
2015-12-21 13:32:57 -05:00 |
|
Isaac Connor
|
1fee421500
|
revert whitespace changes
|
2015-12-21 13:29:41 -05:00 |
|
Isaac Connor
|
c0a79567e6
|
revert whitespace changes
|
2015-12-21 13:26:24 -05:00 |
|
Isaac Connor
|
fdf1912ec1
|
revert whitespace changes
|
2015-12-21 13:11:18 -05:00 |
|
Isaac Connor
|
af9fc1de90
|
revert white space changes.
|
2015-12-21 12:57:05 -05:00 |
|
Isaac Connor
|
0f4757b1ad
|
change method from getPath to Path
|
2015-12-15 12:10:01 -05:00 |
|
Isaac Connor
|
010d7b3d64
|
convert to using storage->getPath instaed of config.events_dir
|
2015-12-15 11:11:34 -05:00 |
|
Isaac Connor
|
14cde582cf
|
Merge branch 'multi-server' into multiserverplusstorage
Conflicts:
src/zm_monitor.h
|
2015-12-14 16:55:26 -05:00 |
|
Isaac Connor
|
b2b1afa8ad
|
Merge master
|
2015-12-14 15:49:32 -05:00 |
SteveGilvarry
|
220ee5e516
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2015-11-29 13:17:22 +11:00 |
|
Isaac Connor
|
f7cc2fb44f
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-11-23 10:42:14 -05:00 |
Andrew Bauer
|
a9609d2a43
|
fix mem alloc fault in zm_monitor.cpp
|
2015-11-21 12:17:23 -06:00 |
Heng Liu
|
17e65d12b4
|
fixed SaveJPEGs are not working
which is caused in errors introduced when merging with master
|
2015-10-31 21:27:23 -07:00 |
|
SteveGilvarry
|
d8494aba2d
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
|
2015-10-23 22:07:22 +11:00 |
|
Isaac Connor
|
ac8bfc71dc
|
fix specifying ServerId
|
2015-10-02 18:22:48 +00:00 |
|
Isaac Connor
|
6ff4e333b4
|
Merge branch 'fix_warnings' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-10-02 15:34:05 +00:00 |
|
Isaac Connor
|
7b253bcd7e
|
Debug line
|
2015-10-02 15:28:51 +00:00 |
|
Isaac Connor
|
8125ef0334
|
change types and move things around to remove compile warnings
|
2015-10-02 09:49:09 -04:00 |
Andrew Bauer
|
4a978034ad
|
Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults
Fix sgfault caused by the privacy mask stuff
|
2015-09-16 10:46:45 -05:00 |
|
Isaac Connor
|
b8f2b1e0a0
|
Merge branch 'mmap_fd_gt_3' into multi-server
|
2015-09-16 11:01:06 -04:00 |
|
Isaac Connor
|
d991912ce4
|
Merge branch 'fix_privacy_mask_segfaults' into multi-server
|
2015-09-16 11:00:57 -04:00 |
|
Isaac Connor
|
e70d49b033
|
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
|
2015-09-16 10:58:57 -04:00 |
|
Isaac Connor
|
6e12febf3d
|
initialize privacy_bitmask and check it before deletep[] to prevent segfault
|
2015-09-16 10:51:27 -04:00 |
|
Isaac Connor
|
0571ca3025
|
quick fix for #1055: make sure our mmap fd is > 2
|
2015-09-16 09:11:22 -04:00 |
|
Isaac Connor
|
bb41ebf776
|
Merge branch 'master' into multi-server
Conflicts:
src/zm_monitor.cpp
|
2015-08-31 16:03:40 -04:00 |
|
Andy Bauer
|
395e628541
|
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
Conflicts:
CMakeLists.txt
configure.ac
version
|
2015-08-29 07:57:18 -05:00 |
|
Isaac Connor
|
09e5463a81
|
test for value in server_id before atoi
|
2015-08-27 11:16:58 -04:00 |
|
Isaac Connor
|
bca9a19488
|
tabs to spaces
|
2015-08-27 11:14:00 -04:00 |