Isaac Connor
|
f6139d33ed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:25:11 -04:00 |
Isaac Connor
|
34111251d9
|
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
|
2018-04-17 07:02:52 -07:00 |
Isaac Connor
|
bcdadc67bf
|
Merge branch 'storageareas' into zma_to_thread
|
2017-12-12 15:29:19 -05:00 |
|
Isaac Connor
|
16ac341642
|
locallist return code vars, they don't need to be class members
|
2017-12-12 12:35:54 -05:00 |
|
Isaac Connor
|
0e7f475ce8
|
merge work from zma_to_thread, but not the zma_to_thread part
|
2017-11-12 11:42:34 -05:00 |
|
Isaac Connor
|
669a23c408
|
change type of width and height to unsigned int and recording from bool to timeval
|
2017-04-12 13:35:07 -04:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
824d7c5b43
|
Merge ../ZoneMinder.Steve into packetqueue
|
2016-08-31 11:58:22 -04:00 |
Steve Gilvarry
|
d1bcb14629
|
Right direction
|
2016-09-01 00:00:10 +10: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 |
|
Steve Gilvarry
|
0abfb7378a
|
Buffer work
|
2016-05-18 00:01:33 +10:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10: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
|
03b1ced568
|
tabs to spaces and use 2space indenting
|
2016-04-04 10:11:48 -04:00 |
|
Isaac Connor
|
c26dbb9028
|
rough in record_audio, and do lots of whitespace cleanups
|
2016-03-31 12:54:56 -04:00 |
|
stevegilvarry
|
557de3efac
|
Add CaptureandRecord from zm_camera.h
|
2014-06-30 21:25:49 +10:00 |
|
stevegilvarry
|
df3ab025f8
|
Imported missing files from master to feature-h264-videostorage
|
2014-05-30 01:47:52 +10:00 |
Kevin Dalley
|
af7a49d8d0
|
Change comments for many Camera subclasses so that comments match the subclass.
|
2014-01-27 16:52:46 -08:00 |
Kfir Itzhak
|
b2a65dc343
|
cURL minor corrections and improvements
|
2014-01-10 09:17:12 +02:00 |
|
Kfir Itzhak
|
0ff77d835b
|
Improved error handling and other minor changes
|
2013-12-31 15:50:06 +02:00 |
|
Kfir Itzhak
|
ff9a26273c
|
cURL is now working!
|
2013-12-27 18:02:32 +02:00 |
|
Kfir Itzhak
|
c1970a51e3
|
Fix few errors and syntax errors regarding curl
|
2013-11-04 17:10:07 +02:00 |
|
Kfir Itzhak
|
8e96df7643
|
Initial work on adding cURL to zoneminder
|
2013-11-04 16:52:21 +02:00 |