e11a5700c7
Removed -frepo line
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3244 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:07 +00:00
df0d6919c9
Added v4l2 interlacing control
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:49:42 +00:00
5203205680
Improved formatting of options and help.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:38:24 +00:00
08a5256cf4
Added update from 1.24.2
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3228 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:21:37 +00:00
cffcd39802
Added ffmpeg monitor presets
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3227 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:21:27 +00:00
828e316885
Updated SVN header
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3226 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:20:54 +00:00
aa4a97d0da
Fixed incorrect monitor type when loading individual ffmpeg monitors. Not used anywhere currently so no impact.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3225 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:18:46 +00:00
420843cfa9
Fixed perl MakeMaker parameters not being passed into Makefile creation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3223 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 12:14:01 +00:00
46358c84e9
Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
215884ecc5
Added properly constructed path to Unix domain socket
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3221 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-05 17:35:25 +00:00
eb0952d9a4
Fixed some issues with triggering and Unix sockets in particular
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3220 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-05 17:33:45 +00:00
04dbf0f016
Renamed zmHttpd conf file to zmApache
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3219 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:30:20 +00:00
dc9e2755b0
Added sample apache config file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
3d613df9d7
Make whole tree to run dir if missing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3217 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 17:18:05 +00:00
10d7d28ac7
Corrected names of scripts included in tar file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3216 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 14:20:43 +00:00
1a8d7c46fc
XML Plugin: Bugfix where EVENT_IMAGE_DIGITS other than 3 would not work. Now uses define
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3215 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-30 12:35:14 +00:00
14376ac519
Updated to mootools 1.2.5
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3214 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-13 22:37:57 +00:00
061a324a36
Fixed issue with image scaling etc when streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3213 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-13 22:30:22 +00:00
192b1310b8
Adding Display language item to hungarian file. Other languages need this
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3212 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-03 17:47:00 +00:00
4dc1fac544
XML Plugin: Added commenting for config.php defines
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3211 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-30 04:32:43 +00:00
00478b3ff2
Fixed id parsing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3209 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:27:08 +00:00
c3918a7ac4
Use pidfile variable instead of hardcoded value. Fixed parameter passed to zmupdate.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3208 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:22:05 +00:00
6c547aba85
Fixed use of analysis images in getImageSrc function plus fixed implementation of overwrite flag in various functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3207 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-28 21:20:02 +00:00
79e24aef44
updated /web/skins/classic/views/options.php:
...
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3206 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:35:12 +00:00
f65edd0cc1
updated /web/skins/classic/views/options.php:
...
added tab for skin selection
updated /web/lang/en_gb.php:
added Display entry and SkinDescription entry
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3205 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 01:33:21 +00:00
a6cded083d
Updated zm_create.sql.in:
...
Path field in Monitors table was 64, should be 255 like in MonitorPresets table. Modified length of Path field in Monitors table from 64 to 255.
SubPath field in Monitors table was 255, should be 64, like in MonitorPresets table. Modified length of SubPath field in Monitors table from 255 to 64.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3204 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 00:17:11 +00:00
635d8e1dad
Grab FFMPEG from ZM_PATH_FFMPEG (if available), more robust error checking against codecs and paths
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3203 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:51 +00:00
bd31f9ec4b
IP Address printout in XML Loggin
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3202 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:33 +00:00
069136fe53
Added vlog function to view log output, ability to redirect XML logging to it's own file
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
18bcfcff7f
Added support for deep-event storage
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3200 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:48 +00:00
c7b3d04eed
Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
d3fa2b2df3
Changed default H264 bitrate for events to 128kbit
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3198 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:07 +00:00
f0165bab78
Prettied-up the splash screen for H264, modified FFMPEG encoding parameters for H264 slightly
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3197 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:07:52 +00:00
5ed6fccd20
- Incremented to p2fs2
...
- H264, MPEG-4 and MJPEG support for encoding of events through parameters now
- Display overlay of still-capture when streaming H264 (transparency)
- Introduced logXmlErr macro
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3196 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:07:37 +00:00
7ab4d4efbe
XML Plugin: Modified H264 behavior to utilize internal MPMoviePlayercontroller in eyeZm. Works more reliably now.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3195 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-15 21:35:29 +00:00
56018fc9b3
XML Plugin: Another bugfix in getEventPathSafe() to account for more variations in ZM installations
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3194 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-15 02:48:12 +00:00
f85c060ba6
XML Plugin: Check for ZM_DIR_EVENTS being defined in getEventPathSafe()
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3193 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-14 18:33:55 +00:00
e57c1b0331
XML Plugin: More config options added, stability fixes to H264 streaming
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
78caa0adb0
XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +00:00
3f1158c2a4
Allow RUNDIR to be specified on command line
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3190 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:23:47 +00:00
46d777398e
Updated to use fixed buffer sizes rather than relying on o/s defined.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:22:35 +00:00
ca4358bfd6
Initial libgcrypt to remove warning in zms and zmu
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:11:06 +00:00
461374dc2a
XML Plugin: Minor commit to impove h264 web-page appearance
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3187 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 07:57:46 +00:00
2d7979ac93
XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
97a99993d7
XML Plugin: Added preliminary H264 feed stream support
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3185 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-10 22:20:29 +00:00
f4b75d4f14
XML Plugin: Speed improvement where using inner join on Frames table was causing large delays for huge tables
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3184 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-10 01:32:14 +00:00
733eef46bd
XML Plugin: Adding zmstreamer to application source
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3183 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-09 20:48:34 +00:00
6307ecbb0c
XML Plugin: Checked for define of ZM_WEB_x_CAN_STREAM since 1.24.1 and .2 don't have this
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3182 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-08 17:23:13 +00:00
2a09efdfd4
XML Plugin: Looks like getEventPath is broken between 1.24.2 and 1.24.3, implement getEventPathSafe to workaround
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3181 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 04:05:16 +00:00
039358e00c
XML Plugin: Removing README
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3180 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-07 02:00:50 +00:00
stan
jaidhar
stagecoach